diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index bdb82e0f8e..460e204312 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4942,6 +4942,8 @@ public class FragmentCompose extends FragmentBase {
                     }
 
                     if (save_drafts &&
+                            (data.draft.ui_encrypt == null ||
+                                    EntityMessage.ENCRYPT_NONE.equals(data.draft.ui_encrypt)) &&
                             (!"new".equals(action) ||
                                     answer > 0 ||
                                     !TextUtils.isEmpty(to) ||