diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 3dda49f4bb..6b6792d18a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4114,7 +4114,8 @@ public class FragmentCompose extends FragmentBase {
                                 args.putBoolean("remind_extra", true);
 
                             if (pgpService.isBound() &&
-                                    !EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt)) {
+                                    (draft.ui_encrypt == null ||
+                                            EntityMessage.ENCRYPT_NONE.equals(draft.ui_encrypt))) {
                                 List<Address> recipients = new ArrayList<>();
                                 if (draft.to != null)
                                     recipients.addAll(Arrays.asList(draft.to));