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