Fix for imap servers which use non-standard name for inbox folder (#1406)

1 files changed, 17 insertions, 5 deletions

diff --git a/src/core/imap/MCIMAPSession.cpp b/src/core/imap/MCIMAPSession.cpp
index bd942a09..3d3830cc 100755
--- a/src/core/imap/MCIMAPSession.cpp
+++ b/src/core/imap/MCIMAPSession.cpp
@@ -1468,11 +1468,23 @@ Array * /* IMAPFolder */ IMAPSession::fetchAllFolders(ErrorCode * pError)
         }
 
         if (!hasInbox) {
-            r = mailimap_list(mImap, "", "INBOX", &imap_folders);
-            Array * inboxResult = resultsWithError(r, imap_folders, pError);
-            if (* pError == ErrorConnection || * pError == ErrorParse)
-                mShouldDisconnect = true;
-            result->addObjectsFromArray(inboxResult);
+            mc_foreacharray(IMAPFolder, folder, result) {
+                if (folder->flags() & IMAPFolderFlagInbox) {
+                    // some mail providers use non-standart name for inbox folder
+                    hasInbox = true;
+                    folder->setPath(MCSTR("INBOX"));
+                    break;
+                }
+            }
+
+            if (!hasInbox) {
+                r = mailimap_list(mImap, "", "INBOX", &imap_folders);
+                Array * inboxResult = resultsWithError(r, imap_folders, pError);
+                if (* pError == ErrorConnection || * pError == ErrorParse)
+                    mShouldDisconnect = true;
+                result->addObjectsFromArray(inboxResult);
+                hasInbox = true;
+            }
         }
     }