MCIMAPCapabilityOperation takes into account cached capabilities values

1 files changed, 9 insertions, 6 deletions

diff --git a/src/async/imap/MCIMAPCapabilityOperation.cpp b/src/async/imap/MCIMAPCapabilityOperation.cpp
index 9edb9b1c..9cd7becb 100644
--- a/src/async/imap/MCIMAPCapabilityOperation.cpp
+++ b/src/async/imap/MCIMAPCapabilityOperation.cpp
@@ -30,13 +30,16 @@ IndexSet * IMAPCapabilityOperation::capabilities()
 
 void IMAPCapabilityOperation::main()
 {
-    ErrorCode error;
-    session()->session()->loginIfNeeded(&error);
-    if (error != ErrorNone) {
-        setError(error);
-        return;
+    ErrorCode error = ErrorNone;
+    mCapabilities = session()->session()->storedCapabilities();
+    if (mCapabilities == NULL) {
+        session()->session()->loginIfNeeded(&error);
+        if (error != ErrorNone) {
+            setError(error);
+            return;
+        }
+        mCapabilities = session()->session()->capability(&error);
     }
-    mCapabilities = session()->session()->capability(&error);
     MC_SAFE_RETAIN(mCapabilities);
     setError(error);
 }