From 53925855fdca4560000588b21928713d5c7b6496 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 15 Dec 2021 16:12:02 +0100
Subject: [PATCH] Check Disposition-Notification-To for inbound messages only

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 6 ++++--
 1 file changed, 4 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 774a46fcd7..63f90ea5e9 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -406,6 +406,7 @@ public class MessageHelper {
                 if (receipt_type == 1 || receipt_type == 2) // Delivery receipt
                     imessage.addHeader("Return-Receipt-To", to);
 
+
                 // https://tools.ietf.org/html/rfc3798
                 if (receipt_type == 0 || receipt_type == 2) // Read receipt
                     imessage.addHeader("Disposition-Notification-To", to);
@@ -1446,8 +1447,9 @@ public class MessageHelper {
     boolean getReceiptRequested() throws MessagingException {
         ensureHeaders();
 
-        return (imessage.getHeader("Return-Receipt-To") != null ||
-                imessage.getHeader("Disposition-Notification-To") != null);
+        // Return-Receipt-To = delivery receipt
+        // Disposition-Notification-To = read receipt
+        return (imessage.getHeader("Disposition-Notification-To") != null);
     }
 
     Address[] getReceiptTo() throws MessagingException {