Index: /trunk/roundcubemail/program/include/rcube_charset.php
===================================================================
--- /trunk/roundcubemail/program/include/rcube_charset.php	(revision 6084)
+++ /trunk/roundcubemail/program/include/rcube_charset.php	(revision 6085)
@@ -45,12 +45,12 @@
         'USERDEFINED'   => 'ISO-8859-15',
         'KSC56011987'   => 'EUC-KR',
-        'GB2312' 	    => 'GBK',
-        'GB231280'	    => 'GBK',
-        'UNICODE'	    => 'UTF-8',
-        'UTF7IMAP'	    => 'UTF7-IMAP',
-        'TIS620'	    => 'WINDOWS-874',
-        'ISO88599'	    => 'WINDOWS-1254',
-        'ISO885911'	    => 'WINDOWS-874',
-        'MACROMAN'	    => 'MACINTOSH',
+        'GB2312'        => 'GBK',
+        'GB231280'      => 'GBK',
+        'UNICODE'       => 'UTF-8',
+        'UTF7IMAP'      => 'UTF7-IMAP',
+        'TIS620'        => 'WINDOWS-874',
+        'ISO88599'      => 'WINDOWS-1254',
+        'ISO885911'     => 'WINDOWS-874',
+        'MACROMAN'      => 'MACINTOSH',
         '77'            => 'MAC',
         '128'           => 'SHIFT-JIS',
@@ -337,5 +337,5 @@
                     }
 
-	                $ch .= $u7;
+                    $ch .= $u7;
                 }
 
@@ -725,5 +725,5 @@
             else if ($ord >= 0xC0) {
                 if (strlen($seq) > 1) {
-	                $out .= preg_match($regexp, $seq) ? $seq : '';
+                    $out .= preg_match($regexp, $seq) ? $seq : '';
                     $seq = '';
                 }
Index: /trunk/roundcubemail/program/include/rcube_ui.php
===================================================================
--- /trunk/roundcubemail/program/include/rcube_ui.php	(revision 6084)
+++ /trunk/roundcubemail/program/include/rcube_ui.php	(revision 6085)
@@ -830,5 +830,5 @@
      * Return html for a structured list <ul> for the mailbox tree
      */
-    private static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
+    public static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
     {
         global $RCMAIL;
@@ -923,5 +923,5 @@
      * Return html for a flat list <select> for the mailbox tree
      */
-    private static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
+    public static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
     {
         global $RCMAIL;