diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 2fb80f21bd..820d189353 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -670,7 +670,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             // Message text preview
             tvPreview.setTypeface(monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT, Typeface.ITALIC);
             tvPreview.setText(message.preview);
-            // bind/clearExpanded will manage visibility
+            tvPreview.setVisibility(preview && !TextUtils.isEmpty(message.preview) ? View.VISIBLE : View.GONE);
 
             // Error / warning
             String error = message.error;
@@ -757,19 +757,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void clearExpanded(TupleMessageEx message) {
-            if (vsBody == null)
-                return;
-
-            cowner.stop();
-
             if (compact) {
                 tvFrom.setSingleLine(true);
                 tvSubject.setSingleLine(true);
-                tvPreview.setVisibility(
-                        preview && message != null && !TextUtils.isEmpty(message.preview)
-                                ? View.VISIBLE : View.GONE);
             }
 
+            tvPreview.setVisibility(
+                    preview && message != null && !TextUtils.isEmpty(message.preview)
+                            ? View.VISIBLE : View.GONE);
+
+            if (vsBody == null)
+                return;
+
+            cowner.stop();
+
             grpAddresses.setVisibility(View.GONE);
             grpHeaders.setVisibility(View.GONE);
             grpCalendar.setVisibility(View.GONE);
@@ -852,9 +853,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             if (compact) {
                 tvFrom.setSingleLine(false);
                 tvSubject.setSingleLine(false);
-                tvPreview.setVisibility(View.GONE);
             }
 
+            tvPreview.setVisibility(View.GONE);
+
             ensureExpanded();
 
             grpAddresses.setVisibility(View.VISIBLE);