From f8ea8b5d05c31c856083d15fdd0493c4e44e34b5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 24 Dec 2021 20:04:51 +0100
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 73c303e56e..23aef4d152 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3310,8 +3310,7 @@ public class MessageHelper {
                         !Part.ATTACHMENT.equalsIgnoreCase(disposition) && TextUtils.isEmpty(filename)) {
                     parts.text.add(new PartHolder(part, contentType));
                 } else {
-                    if ("message/delivery-status".equalsIgnoreCase(contentType.getBaseType()) ||
-                            "message/disposition-notification".equalsIgnoreCase(contentType.getBaseType()))
+                    if (Report.isDeliveryStatus(ct) || Report.isDispositionNotification(ct))
                         parts.extra.add(new PartHolder(part, contentType));
 
                     AttachmentPart apart = new AttachmentPart();