From 02c3e30180d03172ac638c538fb74bcf457c8a85 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 29 May 2021 20:08:03 +0200
Subject: [PATCH] X-Google-Original-From

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 8af763873c..49f58febdf 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1306,7 +1306,10 @@ public class MessageHelper {
     }
 
     Address[] getSender() throws MessagingException {
-        return getAddressHeader("Sender");
+        Address[] sender = getAddressHeader("X-Google-Original-From");
+        if (sender == null)
+            sender = getAddressHeader("Sender");
+        return sender;
     }
 
     Address[] getFrom() throws MessagingException {