Index: config/main.inc.php.dist
===================================================================
--- config/main.inc.php.dist	(revision a605b2584df2dd5bc2bd3b9ba73e71d921eb9a13)
+++ config/main.inc.php.dist	(revision 3c5489ba7547c88ba0f82b6ea0574d1a7185f416)
@@ -106,4 +106,8 @@
 // Enable this option to force LSUB command usage instead.
 $rcmail_config['imap_force_lsub'] = false;
+
+// Some server configurations (e.g. Courier) doesn't list folders in all namespaces
+// Enable this option to force listing of folders in all namespaces
+$rcmail_config['imap_force_ns'] = false;
 
 // IMAP connection timeout, in seconds. Default: 0 (no limit)
Index: plugins/subscriptions_option/package.xml
===================================================================
--- plugins/subscriptions_option/package.xml	(revision 48e9c14ebded89d858c8be0333f77f77a81b0877)
+++ plugins/subscriptions_option/package.xml	(revision 3c5489ba7547c88ba0f82b6ea0574d1a7185f416)
@@ -24,7 +24,7 @@
 	    <active>yes</active>
 	</developer>
-	<date>2012-03-05</date>
+	<date>2012-05-21</date>
 	<version>
-		<release>1.2</release>
+		<release>1.3</release>
 		<api>1.1</api>
 	</version>
Index: plugins/subscriptions_option/subscriptions_option.php
===================================================================
--- plugins/subscriptions_option/subscriptions_option.php	(revision 48e9c14ebded89d858c8be0333f77f77a81b0877)
+++ plugins/subscriptions_option/subscriptions_option.php	(revision 3c5489ba7547c88ba0f82b6ea0574d1a7185f416)
@@ -75,10 +75,7 @@
     function mailboxes_list($args)
     {
-        $rcmail  = rcmail::get_instance();
+        $rcmail = rcmail::get_instance();
         if (!$rcmail->config->get('use_subscriptions', true)) {
-            $storage = $rcmail->get_storage();
-            if ($storage->check_connection()) {
-                $args['folders'] = $storage->conn->listMailboxes($args['root'], $args['name']);
-            }
+            $args['folders'] = $rcmail->get_storage()->list_folders_direct();
         }
         return $args;
Index: program/include/rcube_imap.php
===================================================================
--- program/include/rcube_imap.php	(revision 0af82c8a59855d3010d935f3251a810d2a8cbe60)
+++ program/include/rcube_imap.php	(revision 3c5489ba7547c88ba0f82b6ea0574d1a7185f416)
@@ -2540,9 +2540,6 @@
         }
 
-        // #1486796: some server configurations doesn't
-        // return folders in all namespaces, we'll try to detect that situation
-        // and ask for these namespaces separately
-        // @TODO: make this optional
-        if ($root == '' && $name == '*') {
+        // #1486796: some server configurations doesn't return folders in all namespaces
+        if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
             $this->list_folders_update($a_folders, ($list_extended ? 'ext-' : '') . 'subscribed');
         }
@@ -2674,9 +2671,6 @@
         }
 
-        // #1486796: some server configurations doesn't
-        // return folders in all namespaces, we'll try to detect that situation
-        // and ask for these namespaces separately
-        // @TODO: make this optional
-        if ($root == '' && $name == '*') {
+        // #1486796: some server configurations doesn't return folders in all namespaces
+        if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
             $this->list_folders_update($result);
         }