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