diff --git a/lib/handlers/on-status.js b/lib/handlers/on-status.js
index cc9a88b3..ea35e286 100644
--- a/lib/handlers/on-status.js
+++ b/lib/handlers/on-status.js
@@ -30,24 +30,26 @@ module.exports = server => (path, session, callback) => {
                 return callback(null, 'NONEXISTENT');
             }
 
-            db.database
-                .collection('messages')
-                .find({
+            db.database.collection('messages').countDocuments(
+                {
                     mailbox: mailboxData._id
-                })
-                .maxTimeMS(consts.DB_MAX_TIME_MESSAGES)
-                .count((err, total) => {
+                },
+                {
+                    maxTimeMS: consts.DB_MAX_TIME_MESSAGES
+                },
+                (err, total) => {
                     if (err) {
                         return callback(err);
                     }
-                    db.database
-                        .collection('messages')
-                        .find({
+                    db.database.collection('messages').countDocuments(
+                        {
                             mailbox: mailboxData._id,
                             unseen: true
-                        })
-                        .maxTimeMS(consts.DB_MAX_TIME_MESSAGES)
-                        .count((err, unseen) => {
+                        },
+                        {
+                            maxTimeMS: consts.DB_MAX_TIME_MESSAGES
+                        },
+                        (err, unseen) => {
                             if (err) {
                                 return callback(err);
                             }
@@ -58,8 +60,10 @@ module.exports = server => (path, session, callback) => {
                                 uidValidity: mailboxData.uidValidity,
                                 unseen
                             });
-                        });
-                });
+                        }
+                    );
+                }
+            );
         }
     );
 };