From 6d3f7e618c4c02011922db33184412f06d4a0637 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 30 Apr 2020 15:11:42 +0200
Subject: [PATCH] Fixed spaces in addresses/subjects

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

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 430899215f..edc82b3434 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1030,7 +1030,7 @@ public class MessageHelper {
             return null;
 
         header = fixEncoding(name, header);
-        header = header.replaceAll("\\?=\\r?\\n\\s+=\\?", "\\?==\\?");
+        header = header.replaceAll("\\?=[\\r\\n\\t ]+=\\?", "\\?==\\?");
         Address[] addresses = InternetAddress.parseHeader(header, false);
 
         for (Address address : addresses) {
@@ -1179,7 +1179,7 @@ public class MessageHelper {
             return null;
 
         subject = fixEncoding("subject", subject);
-        subject = subject.replaceAll("\\?=\\r?\\n\\s+=\\?", "\\?==\\?");
+        subject = subject.replaceAll("\\?=[\\r\\n\\t ]+=\\?", "\\?==\\?");
         subject = MimeUtility.unfold(subject);
         subject = decodeMime(subject);