diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index eeb2159c0b..23dc891587 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -430,10 +430,12 @@ public class EntityMessage implements Serializable {
             return false;
         String email = ((InternetAddress) from[0]).getAddress();
         String domain = UriHelper.getEmailDomain(email);
+        if (TextUtils.isEmpty(domain))
+            return false;
         return "duck.com".equals(domain) ||
                 "simplelogin.co".equals(domain) ||
-                "mozmail.com".equals(domain) ||
-                "anonaddy.me".equals(domain);
+                "anonaddy.me".equals(domain) ||
+                domain.endsWith(".mozmail.com");
     }
 
     String[] checkFromDomain(Context context) {
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e0fa1008b6..3abcd03df8 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2691,7 +2691,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"))
                     sender = getAddressHeader("Resent-From");
             }
         }