diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f7ee135671..f8995f5ced 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1263,8 +1263,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             if (info[0].hasPhoto()) {
                 ibAvatar.setImageBitmap(info[0].getPhotoBitmap());
                 ibAvatar.setVisibility(View.VISIBLE);
-            } else
+            } else {
+                ibAvatar.setImageDrawable(null);
                 ibAvatar.setVisibility(View.GONE);
+            }
 
             Uri lookupUri = info[0].getLookupUri();
             ibAvatar.setTag(lookupUri);
@@ -5167,6 +5169,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         holder.powner.recreate();
     }
 
+    @Override
+    public void onViewRecycled(@NonNull ViewHolder holder) {
+        if (holder.ibAvatar != null)
+            holder.ibAvatar.setImageDrawable(null);
+    }
+
     void setSelectionTracker(SelectionTracker<Long> selectionTracker) {
         this.selectionTracker = selectionTracker;
     }