diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5066165e62..d6e0f080e1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -749,7 +749,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             try {
                 InternetAddress via = new InternetAddress(message.identityEmail, message.identityName);
-                tvIdentity.setText(via.toString());
+                tvIdentity.setText(MessageHelper.formatAddresses(new Address[]{via}));
             } catch (UnsupportedEncodingException ex) {
                 tvIdentity.setText(ex.getMessage());
             }
diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index 7bcb4d0b20..d6cff6e27a 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -73,7 +73,7 @@ public class ContactInfo {
             return new ContactInfo();
         InternetAddress address = (InternetAddress) addresses[0];
 
-        String key = address.toString();
+        String key = MessageHelper.formatAddresses(new Address[]{address});
         synchronized (emailContactInfo) {
             ContactInfo info = emailContactInfo.get(key);
             if (info != null && !info.isExpired())