Backporting r5092, r5095, r5096 to release-0.6 branch

1 files changed, 6 insertions, 0 deletions

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 0e28b083a..6a35af0a8 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3513,6 +3513,10 @@ class rcube_imap
      */
     function mailbox_info($mailbox)
     {
+        if ($this->icache['options'] && $this->icache['options']['name'] == $mailbox) {
+            return $this->icache['options'];
+        }
+
         $acl       = $this->get_capability('ACL');
         $namespace = $this->get_namespace();
         $options   = array();
@@ -3574,6 +3578,8 @@ class rcube_imap
             $options['norename'] = $options['is_root'] || $options['namespace'] != 'personal';
         }
 
+        $this->icache['options'] = $options;
+
         return $options;
     }