diff --git a/composer/ChangeLog b/composer/ChangeLog
index 39188aa160..cb16f583a1 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-25  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* e-msg-composer.c (build_message): Use
+	mail_crypto_get_pgp_cipher_context() so that the PGP/GPG decision
+	is done for us.
+
 2002-06-21  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-msg-composer.c (build_message): Use the new gpg cipher context
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 51be07c925..bcfa321e19 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -500,7 +500,7 @@ build_message (EMsgComposer *composer)
 			CamelMultipartSigned *mps;
 			CamelCipherContext *cipher;
 			
-			cipher = camel_gpg_context_new (session, mail_config_get_pgp_path ());
+			cipher = mail_crypto_get_pgp_cipher_context (hdrs->account);
 			if (cipher == NULL) {
 				camel_exception_setv (&ex, CAMEL_EXCEPTION_SYSTEM,
 						      _("Could not create a PGP signature context"));