From 43d6821520344bb3b15f7d78f901a6a6fa430955 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 13 Apr 2024 08:11:18 +0200
Subject: [PATCH] Forwarders: match identity

---
 app/src/main/java/eu/faircode/email/Core.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 74da316986..b91cd4c49c 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -5204,14 +5204,16 @@ class Core {
             if (message.from != null)
                 addresses.addAll(Arrays.asList(message.from));
         } else {
+            Address[] senders = (message.isForwarder() ? message.submitter : message.from);
+
             if (message.to != null)
                 addresses.addAll(Arrays.asList(message.to));
             if (message.cc != null)
                 addresses.addAll(Arrays.asList(message.cc));
             if (message.bcc != null)
                 addresses.addAll(Arrays.asList(message.bcc));
-            if (message.from != null)
-                addresses.addAll(Arrays.asList(message.from));
+            if (senders != null)
+                addresses.addAll(Arrays.asList(senders));
         }
 
         InternetAddress deliveredto = null;