1 files changed, 112 insertions, 29 deletions

diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 43367749c..10efd350f 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -171,21 +171,8 @@
   background-position: -480px -32px;
 }
 
-#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;
+#messagetoolbar a.responses {
+  background-position: -512px 0;
 }
 
 #messagemenu li a.active:hover,
@@ -222,12 +209,22 @@
 #messagemenu li a.openlink,
 #attachmentmenu li a.openlink
 {
-  background-position: 7px -53px;
+  background-position: 7px -52px;
 }
 
 #messagemenu li a.editlink
 {
-  background-position: 7px -71px;
+  background-position: 6px -70px;
+}
+
+#messagemenu li a.movelink
+{
+  background-position: 6px -161px;
+}
+
+#messagemenu li a.copylink
+{
+  background-position: 6px -143px;
 }
 
 #markmessagemenu li a,
@@ -408,38 +405,42 @@
   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 -180px;
+}
+
+#mailboxlist li.trash.empty a
 {
-  background-position: 5px -91px;
+  background-position: 5px -90px;
 }
 
 #mailboxlist li a
@@ -452,6 +453,7 @@
   padding-bottom: 2px;
   text-decoration: none;
   height: 15px;
+  background: url(images/icons/folders.png) 5px 0 no-repeat;
 }
 
 #mailboxlist li.unread
@@ -493,13 +495,75 @@
   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;
+}
+
+#mailboxlist li.mailbox ul li.drafts a
+{
+  background-position: 21px -37px;
+}
+
+#mailboxlist li.mailbox ul li.sent a
+{
+  background-position: 21px -54px;
+}
+
+#mailboxlist li.mailbox ul li.junk a
+{
+  background-position: 21px -73px;
+}
+
+#mailboxlist li.mailbox ul li.trash a
+{
+  background-position: 21px -180px;
+}
+
+#mailboxlist li.mailbox ul li.trash.empty a
+{
+  background-position: 21px -90px;
+}
+
 #listcontrols
 {
   position: relative;
@@ -933,7 +997,7 @@ table.messagelist.fixedcopy
 
 .messagelist tr td.date
 {
-  width: 118px;
+  width: 135px;
   padding: 0 2px;
 }
 
@@ -954,6 +1018,24 @@ table.messagelist.fixedcopy
   color: #CC0000;
 }
 
+/* This padding-left minus the focused padding left should be half of the focused border-left */
+.messagelist thead tr td:first-child,
+.messagelist tbody tr td:first-child {
+	border-left: 0;
+	padding-left: 6px;
+}
+
+/* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
+.messagelist tbody tr.focused > td:first-child {
+	border-left: 4px solid #d4d4d4;
+	padding-left: 4px;
+}
+
+.messagelist tbody tr.selected.focused > td:first-child {
+	border-left: 2px solid #ccc;
+	padding-left: 5px;
+}
+
 .messagelist tr.selected td
 {
   color: #FFFFFF;
@@ -985,6 +1067,7 @@ table.messagelist.fixedcopy
 #listmenu
 {
   padding: 6px;
+  max-height: none;
 }
 
 #listmenu legend