diff --git a/imap.js b/imap.js
index 02f6499e..949a33d7 100644
--- a/imap.js
+++ b/imap.js
@@ -1188,7 +1188,9 @@ server.onSearch = function (path, options, session, callback) {
                     case 'all':
                         if (!ne) {
                             hasAll = true;
-                            query = {};
+                            query = {
+                                mailbox: mailbox._id
+                            };
                         }
                         break;