diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ff72b709..f5acdac6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -208,7 +208,12 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             grpAttachments = itemView.findViewById(R.id.grpAttachments);
             grpExpanded = itemView.findViewById(R.id.grpExpanded);
 
-            setIsRecyclable(viewType != ViewType.THREAD);
+            bnvActions.setHasTransientState(viewType == ViewType.THREAD);
+            btnImages.setHasTransientState(viewType == ViewType.THREAD);
+            tvBody.setHasTransientState(viewType == ViewType.THREAD);
+            pbBody.setHasTransientState(viewType == ViewType.THREAD);
+            grpAttachments.setHasTransientState(viewType == ViewType.THREAD);
+
             tvBody.setMovementMethod(new UrlHandler());
         }