1 files changed, 47 insertions, 27 deletions

diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index e5d55e05c..bf07383c9 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -175,23 +175,6 @@
   background-position: -512px 0;
 }
 
-#messagetoolbar select.mboxlist
-{
-  position: relative;
-  margin: 0 8px;
-  top: 7px;
-}
-
-#messagetoolbar select.mboxlist option
-{
-  padding-left: 15px;
-}
-
-#messagetoolbar select.mboxlist option[value=""]
-{
-  padding-left: 2px;
-}
-
 #messagemenu li a.active:hover,
 #attachmentmenu li a.active:hover,
 #markmessagemenu li a.active:hover
@@ -412,36 +395,35 @@
   display: block;
   position: relative;
   font-size: 11px;
-  background: url(images/icons/folders.png) 5px 0 no-repeat;
   border-bottom: 1px solid #EBEBEB;
 }
 
 #mailboxlist li ul li:last-child
 {
-  border-bottom: none;
+  border-bottom: 0 none;
 }
 
-#mailboxlist li.inbox
+#mailboxlist li.inbox a
 {
   background-position: 5px -18px;
 }
 
-#mailboxlist li.drafts
+#mailboxlist li.drafts a
 {
   background-position: 5px -37px;
 }
 
-#mailboxlist li.sent
+#mailboxlist li.sent a
 {
   background-position: 5px -54px;
 }
 
-#mailboxlist li.junk
+#mailboxlist li.junk a
 {
   background-position: 5px -73px;
 }
 
-#mailboxlist li.trash
+#mailboxlist li.trash a
 {
   background-position: 5px -91px;
 }
@@ -456,6 +438,7 @@
   padding-bottom: 2px;
   text-decoration: none;
   height: 15px;
+  background: url(images/icons/folders.png) 5px 0 no-repeat;
 }
 
 #mailboxlist li.unread
@@ -497,13 +480,50 @@
   padding: 0;
   margin: 0;
   border-top: 1px solid #EBEBEB;
-  padding-left: 15px;
-  background-position: 25px 1px;
   background-color: #FFF;
-  color: blue;
   font-weight: normal;
 }
 
+#mailboxlist li.mailbox ul li a {
+  padding-left: 40px;  /* 24 + 1 x 16 */
+  background-position: 20px 0;  /* 4 + 1 x 16 */
+}
+#mailboxlist li.mailbox ul li div.treetoggle {
+  left: 23px !important;
+}
+
+#mailboxlist li.mailbox ul ul li.mailbox a {
+  padding-left: 56px;  /* 2x */
+  background-position: 36px 0;
+}
+#mailboxlist li.mailbox ul ul li div.treetoggle {
+  left: 39px !important;
+}
+
+#mailboxlist li.mailbox ul ul ul li.mailbox a {
+  padding-left: 72px;  /* 3x */
+  background-position: 52px 0;
+}
+#mailboxlist li.mailbox ul ul ul li div.treetoggle {
+  left: 55px !important;
+}
+
+#mailboxlist li.mailbox ul ul ul ul li.mailbox a {
+  padding-left: 88px;  /* 4x */
+  background-position: 68px 0;
+}
+#mailboxlist li.mailbox ul ul ul ul li div.treetoggle {
+  left: 71px !important;
+}
+
+/* indent folders on levels > 4 */
+#mailboxlist li.mailbox ul ul ul ul ul li {
+  padding-left: 16px;
+}
+#mailboxlist li.mailbox ul ul ul ul ul li div.treetoggle {
+  left: 87px !important;
+}
+
 #listcontrols
 {
   position: relative;