--- imp/lib/IMAP/Tree.php	2005-11-18 18:43:47.000000000 +0100
+++ imp/lib/IMAP/Tree.php	2005-11-22 20:10:52.260870192 +0100
@@ -68,7 +68,8 @@
         if ($imp['base_protocol'] != 'pop3') {
             $ptr = reset($_SESSION['imp']['namespace']);
             $this->_delimiter = $ptr['delimiter'];
-            if (method_exists($this, 'extendedNamespaceSupport')) {
+            global $conf;
+            if (method_exists($this, 'extendedNamespaceSupport') && !$conf['server']['dont_strip_namespace']) {
                 $this->_newimaptree = true;
                 $this->_namespaces = $_SESSION['imp']['namespace'];
                 $this->IMAPchildrenSupport($_SESSION['imp']['imap_server']['children']);



--- framework/IMAP/IMAP/Tree.php	2005-11-18 18:44:46.000000000 +0100
+++ framework/IMAP/IMAP/Tree.php	2005-11-22 21:34:26.770548848 +0100
@@ -409,6 +409,8 @@
             !preg_match("/\{.*pop3.*\}/", $ob->fullServerPath)) {
             $elt['p'] = implode((is_null($ns_info)) ? $this->_delimiter : $ns_info['delimiter'], array_slice($tmp, 0, $elt['c']));
             /* Strip personal namespace. */
+            global $conf;
+            if (!$conf['server']['dont_strip_namespace']) {
             if (!is_null($ns_info) &&
                 !empty($ns_info['name']) &&
                 ($ns_info['type'] == 'personal')) {
@@ -419,6 +421,7 @@
                     $elt['p'] = 'INBOX';
                 }
             }
+            }
         }
         $elt['l'] = String::convertCharset($tmp[$label], 'UTF7-IMAP');



--- imp/config/conf.xml	2005-11-18 18:43:47.000000000 +0100
+++ imp/config/conf.xml	2005-11-19 12:18:09.815006816 +0100
@@ -125,6 +125,8 @@
    significantly higher session size (5 MB+ per user) so make sure your
    session backend can handle the increased storage demands.">
    false</configboolean>
+   <configboolean name="dont_strip_namespace" desc="If you would like to have
+   a hierarchical listing of the folders, you should enable this checkbox.">false</configboolean>
   </configsection>
  </configtab>