From 6acc1a4e7b4571de9e0d7eb301544c46b65a06a7 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 13 Sep 2025 15:30:24 +0200 Subject: [PATCH] Prefer envelope-to over delivered-to --- 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 f2402dd60a..e013423f33 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("Delivered-To", null); - if (header == null) - header = imessage.getHeader("X-Delivered-To", null); - if (header == null) - header = imessage.getHeader("Envelope-To", null); + String header = imessage.getHeader("Envelope-To", null); if (header == null) header = imessage.getHeader("X-Envelope-To", null); if (header == null) header = imessage.getHeader("X-Original-To", null); + if (header == null) + header = imessage.getHeader("Delivered-To", null); + if (header == null) + header = imessage.getHeader("X-Delivered-To", null); return (header == null ? null : MimeUtility.unfold(header)); }