diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8d603667..b67301b3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -125,6 +125,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
         private void clear() {
             ivFlagged.setVisibility(View.GONE);
+            ivAvatar.setVisibility(View.GONE);
             tvFrom.setText(null);
             tvTime.setText(null);
             tvSubject.setText(null);
@@ -133,7 +134,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             tvFolder.setText(null);
             tvCount.setText(null);
             ivThread.setVisibility(View.GONE);
-            tvError.setText(null);
+            tvError.setVisibility(View.GONE);
             pbLoading.setVisibility(View.VISIBLE);
         }