From 35abf48fddee44ead8c010283e4544ebbef3d693 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 13 Sep 2025 19:00:01 +0200 Subject: [PATCH] Revert "Prefer envelope-to over delivered-to" This reverts commit 6acc1a4e7b4571de9e0d7eb301544c46b65a06a7. --- app/src/main/java/eu/faircode/email/MessageHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index e013423f33..f2402dd60a 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -1651,15 +1651,15 @@ public class MessageHelper { String getDeliveredTo() throws MessagingException { ensureHeaders(); - String header = imessage.getHeader("Envelope-To", null); + String header = imessage.getHeader("Delivered-To", null); if (header == null) - header = imessage.getHeader("X-Envelope-To", null); + header = imessage.getHeader("X-Delivered-To", null); if (header == null) - header = imessage.getHeader("X-Original-To", null); + header = imessage.getHeader("Envelope-To", null); if (header == null) - header = imessage.getHeader("Delivered-To", null); + header = imessage.getHeader("X-Envelope-To", null); if (header == null) - header = imessage.getHeader("X-Delivered-To", null); + header = imessage.getHeader("X-Original-To", null); return (header == null ? null : MimeUtility.unfold(header)); }