- small code improvement in rcube_imap::mod_mailbox()

program/include/rcube_imap.php

@@ -2893,10 +2893,12 @@ class rcube_imap
     if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
       return $mbox_name;
 
-    if (!empty($this->root_dir) && $mode=='in') 
+    if (!empty($this->root_dir)) {
-      $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
+      if ($mode=='in')
-    else if (strlen($this->root_dir) && $mode=='out') 
+        $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
-      $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
+      else if (!empty($mbox_name)) // $mode=='out'
+        $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
+      }
     
     return $mbox_name;
     }