diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 48af4a9f50..deff49a6be 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -211,7 +211,11 @@ public class MessageHelper {
     }
 
     Address[] getReply() throws MessagingException {
-        return imessage.getReplyTo();
+        String[] headers = imessage.getHeader("Reply-To");
+        if (headers != null && headers.length > 0)
+            return imessage.getReplyTo();
+        else
+            return null;
     }
 
     static String getFormattedAddresses(Address[] addresses, boolean full) {