diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 0b59ab664f..3ed3353f82 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1591,6 +1591,9 @@ public class MessageHelper {
         header = MimeUtility.unfold(header);
         if (TextUtils.isEmpty(header))
             return result;
+        header = header
+                .replaceAll("<\\s*<", "<")
+                .replaceAll(">\\s*>", ">");
         for (String ref : header.split("[,\\s]+"))
             if (!result.contains(ref))
                 result.add(ref);