From debe78d215aee58fad3e638de1b360eb00b1d770 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 10 Jan 2022 08:51:04 +0100
Subject: [PATCH] Small improvement

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 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 0584be685a..d7e14741d9 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2930,7 +2930,7 @@ public class MessageHelper {
 
                     StringBuilder w = new StringBuilder();
 
-                    if (!report.isDelivered()) {
+                    if (report.isDeliveryStatus() && !report.isDelivered()) {
                         if (report.diagnostic != null) {
                             String diag = report.diagnostic;
                             if (diag.length() > MAX_DIAGNOSTIC)
@@ -2945,7 +2945,7 @@ public class MessageHelper {
                         }
                     }
 
-                    if (!report.isDisplayed()) {
+                    if (report.isDispositionNotification() && !report.isDisplayed()) {
                         if (report.disposition != null)
                             w.append(report.disposition);
                     }