--- functions/tree.php-orig	Fri Sep 19 21:14:04 2003
+++ functions/tree.php	Tue May 11 13:30:13 2004
@@ -105,7 +105,13 @@
 function walkTreeInPostOrderCreatingFoldersUnderTrash($index, $imap_stream, $tree, $topFolderName) {
     global $trash_folder, $delimiter;
 
-    $position = strrpos($topFolderName, $delimiter) + 1;
+//    $position = strrpos($topFolderName, $delimiter) + 1;
+    $position = strrpos($topFolderName, $delimiter);
+    if (($position) or ($position == '0')) {
+    	$position++;
+    } else {
+    	$position = 0;
+    }
     $subFolderName = substr($tree[$index]['value'], $position);
 
     if ($tree[$index]['doIHaveChildren']) {
--- src/folders_delete.php-orig	Sun Mar  9 20:54:34 2003
+++ src/folders_delete.php	Tue May 11 12:42:26 2004
@@ -60,7 +60,7 @@
         ) .
         html_tag( 'tr' ) .
         html_tag( 'td', '', 'center', $color[4] ) .
-        sprintf(_("Are you sure you want to delete %s?"), imap_utf7_decode_local($mailbox)).
+        sprintf(_("Are you sure you want to delete folder '%s'?"), imap_utf7_decode_local($mailbox)).
         '<FORM ACTION="folders_delete.php" METHOD="POST"><p>'.
 
         '<INPUT TYPE=HIDDEN NAME="mailbox" VALUE="'.$mailbox."\">\n" .