diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index da5fd28c19..74b2cd7b38 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -769,7 +769,8 @@ public class MessageHelper {
                     });
                     attachmentPart.setDataHandler(new DataHandler(dataSource));
 
-                    attachmentPart.setFileName(attachment.name);
+                    if (attachment.name != null)
+                        attachmentPart.setFileName(attachment.name);
                     if (attachment.disposition != null)
                         attachmentPart.setDisposition(attachment.disposition);
                     if (attachment.cid != null)