diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 413436ad..4d7b3238 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -193,6 +193,8 @@ public class MessageHelper {
                         }
                     });
                     bpAttachment.setDataHandler(new DataHandler(dataSource));
+                    if (attachment.cid != null)
+                        bpAttachment.setHeader("Content-ID", attachment.cid);
 
                     multipart.addBodyPart(bpAttachment);
                 }