diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 2a39ae8074..9b78eb477b 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2249,7 +2249,7 @@ class Core {
                                 context,
                                 account, folder,
                                 istore, ifolder, (MimeMessage) isub[j],
-                                false, download,
+                                false, download && initialize == 0,
                                 rules, state);
                         ids[from + j] = (message == null || message.ui_hide ? null : message.id);
                     } catch (MessageRemovedException ex) {