From 48e24e37b35ee2ed550c4b3721f3c6d2e397ebf4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 26 May 2026 15:49:22 +0200
Subject: [PATCH] Added AnonAddy mailer.me domain

---
 app/src/main/java/eu/faircode/email/EntityMessage.java | 1 +
 app/src/main/java/eu/faircode/email/MessageHelper.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index b7a8768a85..e4baacce3c 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -460,6 +460,7 @@ public class EntityMessage implements Serializable {
         return "duck.com".equals(domain) ||
                 "simplelogin.co".equals(domain) ||
                 "anonaddy.me".equals(domain) ||
+                "mailer.me".equals(domain) || // AnonAddy
                 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 233aae5332..054e75e710 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2923,6 +2923,9 @@ public class MessageHelper {
         if (sender == null)
             sender = getAddressHeader("X-SimpleLogin-Original-From");
         if (sender == null)
+            // X-AnonAddy-Original-Sender: <email>
+            // X-AnonAddy-Original-Envelope-From: <email>
+            // X-AnonAddy-Original-From-Header: <name>
             sender = getAddressHeader("X-AnonAddy-Original-From-Header");
         if (sender == null)
             sender = getAddressHeader("Sender");