2 files changed, 22 insertions, 9 deletions

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index cf2d59199..de9da282f 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -819,11 +819,18 @@ function rcmail_folder_options($mailbox)
         }
     }
 
-    return $options;    
+    return $options;
 }
 
-// Updates (or creates) folder row in the subscriptions table
-function rcmail_update_folder_row($name, $oldname=null)
+/**
+ * Updates (or creates) folder row in the subscriptions table
+ *
+ * @param string $name      Folder name
+ * @param string $oldname   Old folder name (for update)
+ * @param bool   $subscribe Checks subscription checkbox
+ * @param string $class     CSS class name for folder row
+ */
+function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class_name=null)
 {
     global $IMAP, $CONFIG, $OUTPUT;
 
@@ -837,10 +844,11 @@ function rcmail_update_folder_row($name, $oldname=null)
         . Q($protected ? rcmail_localize_foldername($name) : rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'));
 
     if ($oldname === null)
-        $OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, true);
+        $OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, $subscribe,
+            false, $class_name);
     else
         $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldname, 'UTF7-IMAP'),
-            $name_utf8, $display_name, $protected);
+            $name_utf8, $display_name, $protected, $class_name);
 }
 
 
diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
index a4e752c90..54671133d 100644
--- a/program/steps/settings/save_folder.inc
+++ b/program/steps/settings/save_folder.inc
@@ -71,6 +71,7 @@ else {
 
     $folder['name']     = $name_imap;
     $folder['oldname']  = $old_imap;
+    $folder['class']    = '';
     $folder['settings'] = array(
         // List view mode: 0-list, 1-threads
         'view_mode'   => (int) get_input_value('_viewmode', RCUBE_INPUT_POST),
@@ -82,12 +83,14 @@ else {
 // create a new mailbox
 if (!$error && !strlen($old)) {
 
+    $folder['subscribe'] = true;
+
     $plugin = $RCMAIL->plugins->exec_hook('folder_create', array('record' => $folder));
 
     $folder = $plugin['record'];
 
     if (!$plugin['abort']) {
-        $created = $IMAP->create_mailbox($folder['name'], TRUE);
+        $created = $IMAP->create_mailbox($folder['name'], $folder['subscribe']);
     }
     else {
         $created = $plugin['result'];
@@ -105,9 +108,11 @@ if (!$error && !strlen($old)) {
 
             $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
         }
-  
-        rcmail_update_folder_row($folder['name']);
+
+        rcmail_update_folder_row($folder['name'], null, $folder['subscribe'], $folder['class']);
         $OUTPUT->show_message('foldercreated', 'confirmation');
+        // reset folder preview frame
+        $OUTPUT->command('subscription_select');
         $OUTPUT->send('iframe');
     }
     else {
@@ -163,7 +168,7 @@ else if (!$error) {
 
         $OUTPUT->show_message('folderupdated', 'confirmation');
         if ($rename) {
-            rcmail_update_folder_row($folder['name'], $folder['oldname']);
+            rcmail_update_folder_row($folder['name'], $folder['oldname'], $folder['subscribe'], $folder['class']);
             $OUTPUT->send('iframe');
         }
     }