From d8d7c5bcd31d5b16f23233c5b08f725bfcef32fc Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 20 Aug 2026 12:18:36 +0200 Subject: [PATCH] Decode submitter for @mozmail.com --- app/src/main/java/eu/faircode/email/EntityMessage.java | 1 + app/src/main/java/eu/faircode/email/MessageHelper.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java index ef7468cc88..4ce1f34192 100644 --- a/app/src/main/java/eu/faircode/email/EntityMessage.java +++ b/app/src/main/java/eu/faircode/email/EntityMessage.java @@ -466,6 +466,7 @@ public class EntityMessage implements Serializable { "addymail.com".equals(domain) || // AnonAddy "addy.io".equals(domain) || // AnonAddy "addy.to".equals(domain) || // AnonAddy + "mozmail.com".equals(domain) || domain.endsWith(".mozmail.com"); } diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 5ba63e931b..735c2f9359 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2956,7 +2956,7 @@ public class MessageHelper { Address[] from = getAddressHeader("From"); if (from != null && from.length == 1) { String email = ((InternetAddress) from[0]).getAddress(); - if (email != null && email.endsWith(".mozmail.com")) + if (email != null && (email.endsWith(".mozmail.com") || email.endsWith("@mozmail.com"))) sender = getAddressHeader("Resent-From"); } }