diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 36ece606..fdb0caaf 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -1665,7 +1665,11 @@ public abstract class ExchangeSession {
          * @return message count
          */
         public int count() {
-            return messages.size();
+            if (messages == null) {
+                return count;
+            } else {
+                return messages.size();
+            }
         }
 
         /**