diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 5b40868be8..4f3ffd4895 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5170,7 +5170,8 @@ public class FragmentCompose extends FragmentBase {
 
                                 db.message().setMessageUiEncrypt(message.id, encrypt);
 
-                                if (message.identity != null) {
+                                if (encrypt != EntityMessage.ENCRYPT_NONE &&
+                                        message.identity != null) {
                                     int iencrypt =
                                             (encrypt == EntityMessage.SMIME_SIGNONLY ||
                                                     encrypt == EntityMessage.SMIME_SIGNENCRYPT