diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index e8134ba41..a7b0ab3d0 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -2005,8 +2005,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
         intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
         // this follows user id format of OpenPGP to allow key generation based on it
         // includes account number to make it unique
-        String accName = mAccount.getName() + " (" + mAccount.getAccountNumber() + ") <"
-                + mAccount.getEmail() + ">";
+        String accName = mIdentity.getName() + " <" + mIdentity.getEmail() + ">";
         intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName);
 
         final InputStream is = getOpenPgpInputStream();
diff --git a/src/com/fsck/k9/view/MessageOpenPgpView.java b/src/com/fsck/k9/view/MessageOpenPgpView.java
index 356e54a7d..aa560f81c 100644
--- a/src/com/fsck/k9/view/MessageOpenPgpView.java
+++ b/src/com/fsck/k9/view/MessageOpenPgpView.java
@@ -268,8 +268,7 @@ public class MessageOpenPgpView extends LinearLayout {
         intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
         // this follows user id format of OpenPGP to allow key generation based on it
         // includes account number to make it unique
-        String accName = mAccount.getName() + " (" + mAccount.getAccountNumber() + ") <"
-                + mAccount.getEmail() + ">";
+        String accName = mAccount.getName() + " <" + mAccount.getEmail() + ">";
         intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName);
 
         InputStream is = null;