From 8c2d9d281b82d67f0ea6075bf2c8aefb943a0cf8 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 2 Oct 2019 09:25:18 +0200 Subject: [PATCH] Improved MDN --- .../main/java/eu/faircode/email/MessageHelper.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index fd59da1e3e..a787adb272 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -282,8 +282,18 @@ public class MessageHelper { plainPart.setContent(plainContent, "text/plain; charset=" + Charset.defaultCharset().name()); report.addBodyPart(plainPart); + String from = null; + if (message.from != null && message.from.length > 0) + from = ((InternetAddress) message.from[0]).getAddress(); + + StringBuilder sb = new StringBuilder(); + sb.append("Reporting-UA: ").append(BuildConfig.APPLICATION_ID).append("; ").append(BuildConfig.VERSION_NAME).append("\r\n"); + if (from != null) + sb.append("Original-Recipient: rfc822;").append(from).append("\r\n"); + sb.append("Disposition: manual-action/MDN-sent-manually; displayed").append("\r\n"); + BodyPart dnsPart = new MimeBodyPart(); - dnsPart.setContent("", "message/disposition-notification; name=\"MDNPart2.txt\""); + dnsPart.setContent(sb.toString(), "message/disposition-notification; name=\"MDNPart2.txt\""); dnsPart.setDisposition(Part.INLINE); report.addBodyPart(dnsPart);