Decode submitter for @mozmail.com

master
M66B 3 weeks ago
parent dc54d462da
commit d8d7c5bcd3

@ -466,6 +466,7 @@ public class EntityMessage implements Serializable {
"addymail.com".equals(domain) || // AnonAddy "addymail.com".equals(domain) || // AnonAddy
"addy.io".equals(domain) || // AnonAddy "addy.io".equals(domain) || // AnonAddy
"addy.to".equals(domain) || // AnonAddy "addy.to".equals(domain) || // AnonAddy
"mozmail.com".equals(domain) ||
domain.endsWith(".mozmail.com"); domain.endsWith(".mozmail.com");
} }

@ -2956,7 +2956,7 @@ public class MessageHelper {
Address[] from = getAddressHeader("From"); Address[] from = getAddressHeader("From");
if (from != null && from.length == 1) { if (from != null && from.length == 1) {
String email = ((InternetAddress) from[0]).getAddress(); 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"); sender = getAddressHeader("Resent-From");
} }
} }

Loading…
Cancel
Save