diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index 73509d80b7..1dce2b689b 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -106,7 +106,7 @@ public class ContactInfo {
             return new ContactInfo();
         InternetAddress address = (InternetAddress) addresses[0];
 
-        String key = address.getAddress();
+        String key = MessageHelper.formatAddresses(new Address[]{address});
         synchronized (emailContactInfo) {
             ContactInfo info = emailContactInfo.get(key);
             if (info != null && !info.isExpired())