diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 6c9a2ff425..03cd625aa7 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -4133,6 +4133,9 @@ class Core {
                     reply.setPersonal(from.getPersonal());
             }
 
+            if (helper.isReport() && EntityFolder.DRAFTS.equals(folder.type))
+                message.dsn = EntityMessage.DSN_HARD_BOUNCE;
+
             EntityIdentity identity = matchIdentity(context, folder, message);
             message.identity = (identity == null ? null : identity.id);
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 907656c0b3..a8ecc4d170 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3004,6 +3004,10 @@ public class MessageHelper {
         }
 
         Integer isPlainOnly() {
+            for (PartHolder h : extra)
+                if (h.isReport())
+                    return null;
+
             int html = 0;
             int plain = 0;
             for (PartHolder h : text) {