diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 866a2d30f7..9eaefbcc2c 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1200,7 +1200,12 @@ public class MessageHelper {
     }
 
     Address[] getSender() throws MessagingException {
-        return getAddressHeader("Sender");
+        Address[] sender = getAddressHeader("Sender");
+        if (BuildConfig.DEBUG) {
+            if (sender == null || sender.length == 0)
+                sender = getAddressHeader("Return-Path");
+        }
+        return sender;
     }
 
     Address[] getFrom() throws MessagingException {