diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index e6f7915c30..052fa7f260 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4613,6 +4613,11 @@ public class FragmentCompose extends FragmentBase {
                         return draft;
                     }
 
+                    if (!shouldEncrypt)
+                        for (EntityAttachment attachment : attachments)
+                            if (attachment.isEncryption())
+                                db.attachment().deleteAttachment(attachment.id);
+
                     if (action == R.id.action_save ||
                             action == R.id.action_undo ||
                             action == R.id.action_redo ||