diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8ba6404e5b..f16b4060b5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1304,10 +1304,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void setFrom(TupleMessageEx message, Address[] addresses) {
-            int recipients = (message.to == null ? 0 : message.to.length) +
-                    (message.cc == null ? 0 : message.cc.length) + (message.bcc == null ? 0 : message.bcc.length);
-            if (message.to != null && message.to.length > 0)
-                recipients--;
+            int recipients = 0;
+            if (viewType == ViewType.THREAD) {
+                recipients = (message.to == null ? 0 : message.to.length) +
+                        (message.cc == null ? 0 : message.cc.length) + (message.bcc == null ? 0 : message.bcc.length);
+                if (message.to != null && message.to.length > 0)
+                    recipients--;
+            }
 
             if (recipients == 0)
                 tvFrom.setText(MessageHelper.formatAddresses(addresses, name_email, false));