diff --git a/source/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java b/source/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java
index 785b5ab08f..149c0ab2a6 100644
--- a/source/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java
+++ b/source/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java
@@ -236,7 +236,8 @@ public class AlfrescoImapHostManager implements ImapHostManager
 
         AlfrescoImapFolder result = folderCache.get(folderPath);
 
-        return result;
+        // if folder isn't in cache then add it via registerMailBox method
+        return result != null ? result : registerMailBox(imapService.getOrCreateMailbox(alfrescoUser, mailboxName, true, false));
     }
 
     /**