diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6f95484d97..9b2c12278d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1104,8 +1104,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvCount.setVisibility(View.GONE);
                 ivThread.setVisibility(View.GONE);
             } else {
-                tvCount.setVisibility(threading ? View.VISIBLE : View.GONE);
-                ivThread.setVisibility(View.VISIBLE);
+                tvCount.setVisibility(threading && message.visible > 1 ? View.VISIBLE : View.GONE);
+                ivThread.setVisibility(selected || message.visible > 1 ? View.VISIBLE : View.GONE);
 
                 if (threading_unread)
                     tvCount.setText(context.getString(R.string.title_of,