diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index d8ebd032e5..c8f3be5841 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -599,7 +599,8 @@ public class MessageHelper {
 
                 // Try to guess a better content type
                 // Sometimes PDF files are sent using the wrong type
-                if ("application/octet-stream".equals(attachment.type)) {
+                if ("application/octet-stream".equals(attachment.type) ||
+                        "message/disposition-notification".equals(attachment.type)) {
                     String extension = Helper.getExtension(attachment.name);
                     if (extension != null) {
                         String type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());