diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 9c822695e8..2fc3b6aa6a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4141,7 +4141,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                     Helper.writeText(message.getFile(context), html);
 
                                     // Remove existing attachments
-                                    db.attachment().deleteAttachments(id);
+                                    for (EntityAttachment attachment : attachments)
+                                        if (attachment.encryption == null)
+                                            db.attachment().deleteAttachment(attachment.id);
 
                                     // Add decrypted attachments
                                     List<EntityAttachment> remotes = parts.getAttachments();