diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index d4bf5c2ff6..2dc722b197 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1035,6 +1035,7 @@ public class MessageHelper {
                 //        " content type=" + part.getContentType());
 
                 if (!Part.ATTACHMENT.equalsIgnoreCase(disposition) &&
+                        TextUtils.isEmpty(filename) &&
                         ((parts.plain == null && part.isMimeType("text/plain")) ||
                                 (parts.html == null && part.isMimeType("text/html")))) {
                     if (part.isMimeType("text/plain"))