From 7e672153564e2a423b573362cb0feec0a0620d2a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:13:21 +0200
Subject: [PATCH] Use avatar of original sender when forwarded

---
 .../main/java/eu/faircode/email/AdapterMessage.java |  2 +-
 .../main/java/eu/faircode/email/EntityMessage.java  | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f869b922db..22719137e2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1260,7 +1260,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             message.folderUnified && EntityFolder.isOutgoing(message.folderType)) ||
                     EntityFolder.isOutgoing(message.folderInheritedType);
             String selector = (reverse ? null : message.bimi_selector);
-            Address[] addresses = (reverse ? message.to : message.from);
+            Address[] addresses = (reverse ? message.to : (message.isForwarder() ? message.submitter : message.from));
             Address[] senders = ContactInfo.fillIn(
                     reverse && !show_recipients ? message.to : message.senders, prefer_contact, only_contact);
             Address[] recipients = ContactInfo.fillIn(
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index fa9874245d..e56451e8f6 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -409,6 +409,19 @@ public class EntityMessage implements Serializable {
         return notJunk;
     }
 
+    boolean isForwarder() {
+        if (from == null || from.length != 1)
+            return false;
+        if (submitter == null || submitter.length != 1)
+            return false;
+        String email = ((InternetAddress) from[0]).getAddress();
+        String domain = UriHelper.getEmailDomain(email);
+        return "duck.com".equals(domain) ||
+                "simplelogin.co".equals(domain) ||
+                "mozmail.com".equals(domain) ||
+                "anonaddy.me".equals(domain);
+    }
+
     String[] checkFromDomain(Context context) {
         return MessageHelper.equalRootDomain(context, from, smtp_from);
     }