- Fix handling of INBOX's subfolders in special folders config (#1488279)

2 files changed, 10 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 36eae2f58..9f8f6cc7b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix handling of INBOX's subfolders in special folders config (#1488279)
 - Add ifModule statement for setting Options -Indexes in .htaccess file (#1488274)
 - Fix crashes with eAccelerator (#1488256)
 - Fix searching on IMAP servers without CHARSET specifier support (#1488271)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index ac55acb3a..f4517ccaa 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -704,8 +704,15 @@ function rcmail_user_prefs($current=null)
 
       // load folders list only when needed
       if ($current) {
-        $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
-          'maxlength' => 30, 'exceptions' => array('INBOX'), 'folder_filter' => 'mail', 'folder_rights' => 'w'));
+        $select = rcmail_mailbox_select(array(
+          'noselection'   => '---',
+          'realnames'     => true,
+          'maxlength'     => 30,
+          'folder_filter' => 'mail',
+          'folder_rights' => 'w',
+          // #1486114, #1488279
+          'onchange'      => "if ($(this).val() == 'INBOX') $(this).val('')",
+        ));
       }
       else // dummy select
         $select = new html_select();