Make sure parent folder selector always contains parent folder

of current folder, even if it does not exist

program/include/rcmail.php

@@ -1360,12 +1360,31 @@ class rcmail extends rcube
 
         $delimiter = $storage->get_hierarchy_delimiter();
 
-        foreach ($list as $folder) {
-            if (empty($p['exceptions']) || !in_array($folder, $p['exceptions'])) {
-                $this->build_folder_tree($a_mailboxes, $folder, $delimiter);
+        if (!empty($p['exceptions'])) {
+            $list = array_diff($list, (array) $p['exceptions']);
+        }
+
+        if (!empty($p['additional'])) {
+            foreach ($p['additional'] as $add_folder) {
+                $add_items = explode($delimiter, $add_folder);
+                $folder    = '';
+                while (count($add_items)) {
+                    $folder .= array_shift($add_items);
+
+                    // @TODO: sorting
+                    if (!in_array($folder, $list)) {
+                        $list[] = $folder;
+                    }
+
+                    $folder .= $delimiter;
+                }
             }
         }
 
+        foreach ($list as $folder) {
+            $this->build_folder_tree($a_mailboxes, $folder, $delimiter);
+        }
+
         $select = new html_select($p);
 
         if ($p['noselection']) {

program/steps/settings/edit_folder.inc

@@ -139,6 +139,7 @@ function rcmail_folder_form($attrib)
             'unsubscribed' => true,
             'skip_noinferiors' => true,
             'exceptions'  => $exceptions,
+            'additional'  => strlen($selected) ? array($selected) : null,
         ));
 
         $form['props']['fieldsets']['location']['content']['path'] = array(