diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 72a5db2754..847a77bc77 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4134,6 +4134,10 @@ public class FragmentCompose extends FragmentBase {
 
                                     if (cid.contains(attachment.cid))
                                         attachment.disposition = Part.INLINE;
+                                    else {
+                                        attachment.cid = null;
+                                        attachment.disposition = Part.ATTACHMENT;
+                                    }
 
                                     attachment.id = null;
                                     attachment.message = data.draft.id;