diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index da186a23b9..c81feb5f87 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2260,6 +2260,8 @@ public class MessageHelper {
 
         header = fixEncoding(name, header);
         header = header.replaceAll("\\?=[\\r\\n\\t ]+=\\?", "\\?==\\?");
+        header = MimeUtility.unfold(header);
+        header = decodeMime(header);
         Address[] addresses = InternetAddress.parseHeader(header, false);
 
         List<Address> result = new ArrayList<>();