diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a80cb9c93b..b3d1647bd3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4831,6 +4831,9 @@ public class FragmentCompose extends FragmentBase {
                             draft.ui_encrypt == null || EntityMessage.ENCRYPT_NONE.equals(draft.ui_encrypt))
                         return null;
 
+                    if (draft.identity != null && draft.identity.equals(iid))
+                        return draft.ui_encrypt;
+
                     EntityIdentity identity = db.identity().getIdentity(iid);
                     if (identity == null)
                         return null;