From ece57805032a6f61a2f74eac27ad8a336aba12c8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 24 Dec 2021 20:27:17 +0100
Subject: [PATCH] Small improvement

---
 .../java/eu/faircode/email/MessageHelper.java | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 23aef4d152..01e69fb6c6 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2568,10 +2568,27 @@ public class MessageHelper {
                 } else if (h.isReport()) {
                     Report report = new Report(h.contentType.getBaseType(), result);
                     result = report.html;
-                    if (!report.isDelivered() && report.diagnostic != null)
-                        warnings.add(report.diagnostic);
-                    if (!report.isDisplayed() && report.disposition != null)
-                        warnings.add(report.disposition);
+
+                    StringBuilder w = new StringBuilder();
+
+                    if (!report.isDelivered()) {
+                        if (report.diagnostic != null)
+                            w.append(report.diagnostic);
+                        if (report.action != null) {
+                            if (w.length() == 0)
+                                w.append(report.action);
+                            else
+                                w.append(" (").append(report.action).append(')');
+                        }
+                    }
+
+                    if (!report.isDisplayed()) {
+                        if (report.disposition != null)
+                            w.append(report.disposition);
+                    }
+
+                    if (w.length() > 0)
+                        warnings.add(w.toString());
                 } else
                     Log.w("Unexpected content type=" + h.contentType);