diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 095e1bfe01..ebfe9ebe11 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2183,6 +2183,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean content = (message.content || message.error != null);
             tvNoInternetBody.setVisibility(suitable || content ? View.GONE : View.VISIBLE);
 
+            grpDownloading.setVisibility(View.GONE);
+            ibDownload.setVisibility(View.GONE);
+
             eowner.start();
             db.operation().liveOperations(message.id, EntityOperation.BODY).observe(eowner, new Observer<TupleMessageOperation>() {
                 @Override
@@ -2959,6 +2962,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 return;
             }
 
+            grpDownloading.setVisibility(View.GONE);
+            ibDownload.setVisibility(View.GONE);
+
             evalProperties(message);
 
             boolean show_full = properties.getValue("full", message.id);