diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 0a73365c28..7b86558a22 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1046,6 +1046,7 @@ public class MessageHelper {
             return null;
 
         header = fixEncoding(name, header);
+        header = header.replaceAll("\\?=\\r?\\n\\s+=\\?", "\\?==\\?");
         Address[] addresses = InternetAddress.parseHeader(header, false);
 
         for (Address address : addresses) {