- Fix folders css class setting for folder with names matching defined classes (#1485355)

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 29024a70c..44c23822b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ CHANGELOG RoundCube Webmail
 2008/10/02 (alec)
 ----------
 - Minimize "inline" javascript scripts use (#1485433)
+- Fix folders css class setting for folder with names matching defined classes (#1485355)
 
 2008/10/01 (alec)
 - Fix spellchecking when switching to html editor (#1485362)
diff --git a/program/include/main.inc b/program/include/main.inc
index 0eb8dc757..23c2c2822 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1067,8 +1067,10 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $at
       $classes[] = 'trash';
     else if ($folder['id']==$CONFIG['junk_mbox'])
       $classes[] = 'junk';
+    else if ($folder['id']=='INBOX')
+      $classes[] = 'inbox';
     else
-      $classes[] = asciiwords($folder_class ? $folder_class : strtolower($folder['id']), true);
+      $classes[] = '_'.asciiwords($folder_class ? $folder_class : strtolower($folder['id']), true);
       
     $classes[] = $zebra_class;