diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 2c3e2298fb..4da9c637b2 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1706,7 +1706,8 @@ public class MessageHelper {
                                 }
                         }
                     }
-                } else if (part.isMimeType("message/delivery-status")) {
+                } else if (part.isMimeType("message/delivery-status") ||
+                        part.isMimeType("message/disposition-notification")) {
                     StringBuilder report = new StringBuilder();
                     report.append("<hr><div style=\"font-family: monospace; font-size: small;\">");
                     for (String line : result.split("\\r?\\n")) {
@@ -2078,7 +2079,8 @@ public class MessageHelper {
                     else if (html)
                         parts.html.add(part);
                 } else {
-                    if ("message/delivery-status".equalsIgnoreCase(contentType.getBaseType()))
+                    if ("message/delivery-status".equalsIgnoreCase(contentType.getBaseType()) ||
+                            "message/disposition-notification".equalsIgnoreCase(contentType.getBaseType()))
                         parts.extra.add(part);
 
                     AttachmentPart apart = new AttachmentPart();