diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a520c57ef7..ac1c808542 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -629,7 +629,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }
         }
 
-        private void clear() {
+        private void clear(boolean loading) {
             ivAvatarStart.setVisibility(View.GONE);
             ivAvatarEnd.setVisibility(View.GONE);
             vwColor.setVisibility(View.GONE);
@@ -655,7 +655,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvPreview.setVisibility(View.GONE);
             tvError.setVisibility(View.GONE);
             ibHelp.setVisibility(View.GONE);
-            pbLoading.setVisibility(View.VISIBLE);
+            pbLoading.setVisibility(loading ? View.VISIBLE : View.GONE);
 
             clearExpanded(null);
         }
@@ -4029,7 +4029,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         holder.unwire();
 
         if (message == null || context == null)
-            holder.clear();
+            holder.clear(true);
         else {
             holder.bindTo(message);
             holder.wire();
@@ -4044,6 +4044,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         holder.powner.recreate();
     }
 
+    @Override
+    public void onViewRecycled(@NonNull ViewHolder holder) {
+        holder.clear(false);
+    }
+
     void setSelectionTracker(SelectionTracker<Long> selectionTracker) {
         this.selectionTracker = selectionTracker;
     }