*** horde/framework/IMAP/IMAP/Tree.php.ori       2005-11-18 18:44:46.000000000 +0100
--- horde/framework/IMAP/IMAP/Tree.php       2005-11-19 12:25:32.874651512 +0100
***************
*** 409,414 ****
--- 409,416 ----
              !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,424 ****
--- 421,427 ----
                      $elt['p'] = 'INBOX';
                  }
              }
+             }
          }
          $elt['l'] = String::convertCharset($tmp[$label], 'UTF7-IMAP');


*** horde/imp/config/conf.xml.ori       2005-11-18 18:43:47.000000000 +0100
--- horde/imp/config/conf.xml   2005-11-19 12:18:09.815006816 +0100
***************
*** 125,130 ****
--- 125,132 ----
     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>