diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 829a3dfdfa..c101af0dfd 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -798,17 +798,18 @@ class Core {
                 return;
             }
 
-            Message[] imessages;
+            boolean archived;
             Folder iarchive = istore.getFolder(archive.name);
             try {
                 iarchive.open(Folder.READ_ONLY);
-                imessages = ifolder.search(new MessageIDTerm(message.msgid));
+                Message[] imessages = iarchive.search(new MessageIDTerm(message.msgid));
+                archived = (imessages != null && imessages.length > 0);
             } finally {
                 if (iarchive.isOpen())
                     iarchive.close();
             }
 
-            if (imessages != null && imessages.length > 0)
+            if (archived)
                 try {
                     Message imessage = ifolder.getMessageByUID(message.uid);
                     if (imessage == null)