From f25ca3837600b14299b40779a83e0e2e9b0ae672 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 14 Aug 2018 17:23:35 +0000
Subject: [PATCH] Fixed fetching reply-to address

Who had thought that get 'reply-to' would return 'to' if not present?
---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 6 +++++-
 1 file changed, 5 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 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) {