diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 985306334f..e8d7626b1f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2700,17 +2700,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private void onActionDecrypt(TupleMessageEx message, boolean auto) {
             int encrypt = (message.encrypt == null ? EntityMessage.PGP_SIGNENCRYPT /* Inline */ : message.encrypt);
-            String recipient = null;
-            if (message.to != null && message.to.length == 1)
-                recipient = ((InternetAddress) message.to[0]).getAddress();
 
             LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
             lbm.sendBroadcast(
                     new Intent(FragmentMessages.ACTION_DECRYPT)
                             .putExtra("id", message.id)
                             .putExtra("auto", auto)
-                            .putExtra("type", encrypt)
-                            .putExtra("recipient", recipient));
+                            .putExtra("type", encrypt));
         }
 
         private void onActionReplyMenu(TupleMessageEx message) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index b0139eea55..bc6eeb475c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3896,7 +3896,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         long id = intent.getLongExtra("id", -1);
         boolean auto = intent.getBooleanExtra("auto", false);
         int type = intent.getIntExtra("type", EntityMessage.ENCRYPT_NONE);
-        String recipient = intent.getStringExtra("recipient");
 
         final Bundle args = new Bundle();
         args.putLong("id", id);
@@ -3905,27 +3904,50 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         if (EntityMessage.SMIME_SIGNONLY.equals(type))
             onSmime(args);
         else if (EntityMessage.SMIME_SIGNENCRYPT.equals(type)) {
-            Helper.selectKeyAlias(getActivity(), recipient, new Helper.IKeyAlias() {
+            new SimpleTask<EntityIdentity>() {
                 @Override
-                public void onSelected(String alias) {
-                    args.putString("alias", alias);
-                    onSmime(args);
+                protected EntityIdentity onExecute(Context context, Bundle args) {
+                    long id = args.getLong("id");
+
+                    DB db = DB.getInstance(context);
+
+                    EntityMessage message = db.message().getMessage(id);
+                    if (message == null || message.identity == null)
+                        return null;
+
+                    return db.identity().getIdentity(message.identity);
                 }
 
                 @Override
-                public void onNothingSelected() {
-                    Snackbar snackbar = Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG);
-                    final Intent intent = KeyChain.createInstallIntent();
-                    if (intent.resolveActivity(getContext().getPackageManager()) != null)
-                        snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                startActivity(intent);
-                            }
-                        });
-                    snackbar.show();
+                protected void onExecuted(Bundle args, EntityIdentity identity) {
+                    Helper.selectKeyAlias(getActivity(), identity == null ? null : identity.sign_key_alias, new Helper.IKeyAlias() {
+                        @Override
+                        public void onSelected(String alias) {
+                            args.putString("alias", alias);
+                            onSmime(args);
+                        }
+
+                        @Override
+                        public void onNothingSelected() {
+                            Snackbar snackbar = Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG);
+                            final Intent intent = KeyChain.createInstallIntent();
+                            if (intent.resolveActivity(getContext().getPackageManager()) != null)
+                                snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        startActivity(intent);
+                                    }
+                                });
+                            snackbar.show();
+                        }
+                    });
                 }
-            });
+
+                @Override
+                protected void onException(Bundle args, Throwable ex) {
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
+                }
+            }.execute(this, args, "messages:alias");
         } else {
             if (pgpService.isBound()) {
                 Intent data = new Intent();