diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index c1c1c9d37b..698daa1c29 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -759,7 +759,7 @@ class Core {
                 ifolder.fetch(new Message[]{imessage}, fp);
 
                 EntityMessage message = synchronizeMessage(context, account, folder, ifolder, imessage, false, download, rules, state);
-                if (message != null && download)
+                if (download && message != null)
                     downloadMessage(context, folder, ifolder, imessage, message.id, state);
             } finally {
                 imessage.invalidateHeaders();