diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b8fedcb1b0..b1f8420c60 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4799,7 +4799,7 @@ public class FragmentCompose extends FragmentBase {
                         return draft;
                     }
 
-                    if (!shouldEncrypt)
+                    if (!shouldEncrypt && !autosave)
                         for (EntityAttachment attachment : attachments)
                             if (attachment.isEncryption())
                                 db.attachment().deleteAttachment(attachment.id);