diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 266182434..8457478c6 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -152,7 +152,7 @@ class archive extends rcube_plugin
         );
 
         foreach (rcmail::get_uids(null, null, $multifolder, rcube_utils::INPUT_POST) as $mbox => $uids) {
-            if (!$archive_folder || strpos($mbox, $archive_prefix) === 0) {
+            if (!$archive_folder || $mbox === $archive_folder || strpos($mbox, $archive_prefix) === 0) {
                 $count = count($uids);
                 continue;
             }