diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f6eda66fcf..e4abbb759d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6857,7 +6857,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.check_blocklist = prefs.getBoolean("check_blocklist", false);
 
         this.email_format = ("sender".equals(sort)
-                ? MessageHelper.AddressFormat.NAME_EMAIL
+                ? MessageHelper.AddressFormat.EMAIL_ONLY
                 : MessageHelper.getAddressFormat(context));
         this.prefer_contact = prefs.getBoolean("prefer_contact", false);
         this.only_contact = prefs.getBoolean("only_contact", false);
@@ -7520,7 +7520,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         if (!sort.equals(this.sort)) {
             this.sort = sort;
             this.email_format = ("sender".equals(sort)
-                    ? MessageHelper.AddressFormat.NAME_EMAIL
+                    ? MessageHelper.AddressFormat.EMAIL_ONLY
                     : MessageHelper.getAddressFormat(context));
             properties.refresh();
             // Needed to redraw item decorators / add/remove size