Decode submitter for @mozmail.com

3 weeks ago · d8d7c5bcd3
parent dc54d462da
commit d8d7c5bcd3
2 changed files with 2 additions and 1 deletions
--- 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");
    }

--- 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");
            }
        }