diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index d39ae5770d..f6181ee121 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -177,9 +177,18 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
             if (identity.sign_key != null)
                 sb.append(Long.toHexString(identity.sign_key));
             if (identity.sign_key_alias != null) {
-                if (sb.length() != 0)
-                    sb.append(", ");
-                sb.append(identity.sign_key_alias);
+                String s = identity.getAlias(EntityMessage.SMIME_SIGNONLY);
+                String e = identity.getAlias(EntityMessage.SMIME_SIGNENCRYPT);
+                if (s != null) {
+                    if (sb.length() != 0)
+                        sb.append(", ");
+                    sb.append(s);
+                }
+                if (e != null && !e.equals(s)) {
+                    if (sb.length() != 0)
+                        sb.append(", ");
+                    sb.append(e);
+                }
             }
 
             tvSignKeyId.setText(context.getString(R.string.title_sign_key, sb.toString()));
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 24baaa3dc9..9f76ce184d 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -205,6 +205,38 @@ public class EntityIdentity {
         return false;
     }
 
+    void setAlias(String alias, int type) throws JSONException {
+        JSONObject jaliases;
+        if (sign_key_alias == null)
+            jaliases = new JSONObject();
+        else
+            try {
+                jaliases = new JSONObject(sign_key_alias);
+            } catch (JSONException ex) {
+                Log.w(ex);
+                jaliases = new JSONObject();
+                jaliases.put("s", sign_key_alias);
+                jaliases.put("e", sign_key_alias);
+            }
+
+        jaliases.put(type == EntityMessage.SMIME_SIGNONLY ? "s" : "e", alias);
+        sign_key_alias = jaliases.toString();
+    }
+
+    String getAlias(int type) {
+        if (sign_key_alias == null)
+            return null;
+
+        try {
+            JSONObject jaliases = new JSONObject(sign_key_alias);
+            String key = (type == EntityMessage.SMIME_SIGNONLY ? "s" : "e");
+            return (jaliases.has(key) ? jaliases.getString(key) : null);
+        } catch (JSONException ex) {
+            Log.w(ex);
+            return sign_key_alias;
+        }
+    }
+
     public JSONObject toJSON() throws JSONException {
         JSONObject json = new JSONObject();
         json.put("id", id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f7f2372f04..efdb5cf4ff 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3213,6 +3213,7 @@ public class FragmentCompose extends FragmentBase {
                 @Override
                 protected EntityIdentity onExecute(Context context, Bundle args) {
                     long id = args.getLong("id");
+                    int type = args.getInt("type");
 
                     DB db = DB.getInstance(context);
                     EntityMessage draft = db.message().getMessage(id);
@@ -3220,10 +3221,14 @@ public class FragmentCompose extends FragmentBase {
                         return null;
 
                     EntityIdentity identity = db.identity().getIdentity(draft.identity);
-                    if (identity != null && identity.sign_key_alias != null)
+                    if (identity != null)
                         try {
-                            PrivateKey key = KeyChain.getPrivateKey(context, identity.sign_key_alias);
-                            args.putBoolean("available", key != null);
+                            String alias = identity.getAlias(type);
+                            if (alias != null) {
+                                args.putString("alias", alias);
+                                PrivateKey key = KeyChain.getPrivateKey(context, alias);
+                                args.putBoolean("available", key != null);
+                            }
                         } catch (Throwable ex) {
                             Log.w(ex);
                         }
@@ -3238,13 +3243,13 @@ public class FragmentCompose extends FragmentBase {
 
                     boolean available = args.getBoolean("available");
                     if (available) {
-                        args.putString("alias", identity.sign_key_alias);
                         onSmime(args, action, extras);
                         return;
                     }
 
-                    if (interactive)
-                        Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), identity.sign_key_alias, new Helper.IKeyAlias() {
+                    if (interactive) {
+                        String alias = args.getString("alias");
+                        Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), alias, new Helper.IKeyAlias() {
                             @Override
                             public void onSelected(String alias) {
                                 args.putString("alias", alias);
@@ -3269,6 +3274,7 @@ public class FragmentCompose extends FragmentBase {
                                 snackbar.show();
                             }
                         });
+                    }
                 }
 
                 @Override
@@ -4463,7 +4469,8 @@ public class FragmentCompose extends FragmentBase {
                 }
 
                 // Store selected alias
-                db.identity().setIdentitySignKeyAlias(identity.id, alias);
+                identity.setAlias(alias, type);
+                db.identity().setIdentitySignKeyAlias(identity.id, identity.sign_key_alias);
 
                 // Build content
                 File sinput = new File(tmp, draft.id + ".smime_sign");
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 74ea66434f..eaf2054c44 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -9432,11 +9432,12 @@ public class FragmentMessages extends FragmentBase
 
                 @Override
                 protected void onExecuted(Bundle args, EntityIdentity identity) {
+                    int type = args.getInt("type");
                     boolean auto = args.getBoolean("auto");
                     if (auto && identity == null)
                         return;
 
-                    String alias = (identity == null ? null : identity.sign_key_alias);
+                    String alias = (identity == null ? null : identity.getAlias(type));
                     Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), alias, new Helper.IKeyAlias() {
                         @Override
                         public void onSelected(String alias) {
@@ -10679,6 +10680,7 @@ public class FragmentMessages extends FragmentBase
             }
 
             private void decodeMessage(Context context, InputStream is, EntityMessage message, Bundle args) throws MessagingException, IOException {
+                int type = args.getInt("type");
                 String alias = args.getString("alias");
                 boolean duplicate = args.getBoolean("duplicate");
 
@@ -10765,10 +10767,17 @@ public class FragmentMessages extends FragmentBase
                     db.message().setMessageStored(message.id, new Date().getTime());
                     db.message().setMessageFts(message.id, false);
 
-                    if (alias != null && !duplicate && message.identity != null)
-                        db.identity().setIdentitySignKeyAlias(message.identity, alias);
+                    if (alias != null && !duplicate && message.identity != null) {
+                        EntityIdentity identity = db.identity().getIdentity(message.identity);
+                        if (identity != null) {
+                            identity.setAlias(alias, type);
+                            db.identity().setIdentitySignKeyAlias(identity.id, identity.sign_key_alias);
+                        }
+                    }
 
                     db.setTransactionSuccessful();
+                } catch (JSONException ex) {
+                    Log.e(ex);
                 } catch (SQLiteConstraintException ex) {
                     // Message removed
                     Log.w(ex);