diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index eb29dcfc1d..cfe0a29252 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1236,6 +1236,14 @@ public class MessageHelper {
             if (TextUtils.isEmpty(email) && TextUtils.isEmpty(personal))
                 continue;
 
+            if (personal != null && personal.equals(email))
+                try {
+                    iaddress.setPersonal(null);
+                    personal = null;
+                } catch (UnsupportedEncodingException ex) {
+                    Log.w(ex);
+                }
+
             email = decodeMime(email);
             if (!Helper.isSingleScript(email))
                 email = punyCode(email);