Index: /trunk/roundcubemail/CHANGELOG
===================================================================
--- /trunk/roundcubemail/CHANGELOG	(revision 1443)
+++ /trunk/roundcubemail/CHANGELOG	(revision 1444)
@@ -1,4 +1,8 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/05/28 (alec)
+----------
+- Fixed sorting of folders with non-ascii characters
 
 2008/05/21 (alec)
Index: /trunk/roundcubemail/program/include/rcube_imap.php
===================================================================
--- /trunk/roundcubemail/program/include/rcube_imap.php	(revision 1443)
+++ /trunk/roundcubemail/program/include/rcube_imap.php	(revision 1444)
@@ -2503,11 +2503,13 @@
         $a_defaults[$p] = $folder;
       else
-        $a_out[] = $folder;
-      }
-
-    natcasesort($a_out);
+	{
+	$l_folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF-7'));
+	}
+      }
+
+    asort($l_folders, SORT_LOCALE_STRING);
     ksort($a_defaults);
-    
-    return array_merge($a_defaults, $a_out);
+
+    return array_merge($a_defaults, array_keys($l_folders));
     }