6 files changed, 97 insertions, 41 deletions
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index e3a824fed..82031db21 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -25,9 +25,7 @@ img
   background-image: url(images/display/icons.gif);
 }
 
-#messagemenu li a,
-#messagelist tr td div.expanded,
-#messagelist tr td div.collapsed
+#messagemenu li a
 {
   background-image: url(images/messageactions.gif);
 }
@@ -122,3 +120,18 @@ ul.toolbarmenu li.separator_below
 {
   height: expression((parseInt(document.documentElement.clientHeight)-105)+'px');
 }
+
+#messagelist tr td div.collapsed,
+#messagelist tr td div.expanded,
+#messagelist tr td.attachment span.attachment,
+#messagelist tr td.flag span.flagged,
+#messagelist tr td.flag span.unflagged:hover,
+#messagelist tr td.subject span.msgicon,
+#messagelist tr td.subject span.msgicon.replied,
+#messagelist tr td.subject span.msgicon.forwarded,
+#messagelist tr td.subject span.msgicon.deleted,
+#messagelist tr td.subject span.msgicon.unread,
+#messagelist tr td.subject span.msgicon.unreadchildren
+{
+  background-image: url(images/messageicons.gif);
+}
diff --git a/skins/default/images/messageicons.gif b/skins/default/images/messageicons.gif
new file mode 100644
index 000000000..07e90cca0
--- /dev/null
+++ b/skins/default/images/messageicons.gif
diff --git a/skins/default/images/messageicons.png b/skins/default/images/messageicons.png
new file mode 100644
index 000000000..7d21ab969
--- /dev/null
+++ b/skins/default/images/messageicons.png
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 84313a8da..3342f8957 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -689,50 +689,100 @@ body.messagelist
   cursor: inherit;
 }
 
-#messagelist tr td.icon,
-#messagelist tr td.threads,
-#messagelist tr td.attachment,
-#messagelist tr td.flag
+#messagelist td span,
+#messagelist td img
 {
-  width: 18px;
-  padding: 0px 1px 1px 3px;
+  vertical-align: middle;
+  display: inline-block;
 }
 
-#messagelist tbody td span.branch,
-#messagelist tbody td img
+#messagelist tr td div.collapsed,
+#messagelist tr td div.expanded,
+#messagelist tbody tr td.flag
 {
-  vertical-align: middle;
-  display: inline-block;
+  cursor: pointer;
 }
 
-#messagelist tbody td img.msgicon
+#messagelist tr td.flag span,
+#messagelist tr td.attachment span
 {
-  margin: 0 2px;
+  width: 15px;
 }
 
 #messagelist tr td div.collapsed,
 #messagelist tr td div.expanded,
-#messagelist tr td img.flagicon,
-#messagelist tr td img.msgicon,
-#messagelist tbody tr td.flag
+#messagelist tr td.attachment span.attachment,
+#messagelist tr td.flag span.flagged,
+#messagelist tr td.flag span.unflagged:hover,
+#messagelist tr td.subject span.msgicon,
+#messagelist tr td.subject span.msgicon.replied,
+#messagelist tr td.subject span.msgicon.forwarded,
+#messagelist tr td.subject span.msgicon.deleted,
+#messagelist tr td.subject span.msgicon.unread,
+#messagelist tr td.subject span.msgicon.unreadchildren
+{
+  vertical-align: middle;
+  height: 17px;
+  width: 15px;
+  background: url(images/messageicons.png) center no-repeat;
+}
+
+#messagelist tr td.attachment span.attachment
+{
+  background-position: -150px 0;
+}
+
+#messagelist tr td.flag span.flagged
+{
+  background-position: -135px 0;
+}
+
+#messagelist tr td.flag span.unflagged:hover
+{
+  background-position: -120px 0;
+}
+
+#messagelist tr td.subject span.msgicon,
+#messagelist tr td.subject span.msgicon.unreadchildren
 {
+  background-position: -45px 0;
+  margin: 0 2px;
   cursor: pointer;
 }
 
-#messagelist tr td div.collapsed
+#messagelist tr td.subject span.msgicon.replied
 {
-  background: url(images/messageactions.png) -1px -91px no-repeat;
+  background-position: -60px 0;
 }
 
-#messagelist tr td div.expanded
+#messagelist tr td.subject span.msgicon.forwarded
+{
+  background-position: -75px 0;
+}
+
+#messagelist tr td.subject span.msgicon.replied.forwarded
+{
+  background-position: -90px 0;
+}
+
+#messagelist tr td.subject span.msgicon.deleted
+{
+  background-position: -165px 0;
+}
+
+#messagelist tr td.subject span.msgicon.unread
+{
+  background-position: -105px 0;
+}
+
+#messagelist tr td div.collapsed
 {
-  background: url(images/messageactions.png) -1px -109px no-repeat;
+  background-position: -195px 0;
 }
 
-#messagelist tbody tr td.flag img:hover,
-#messagelist thead tr td.flag img
+#messagelist tr td div.expanded
 {
-  background: url(images/icons/unflagged.png) center no-repeat;
+  background-position: -180px 0;
 }
 
 #messagelist tbody tr td.subject
@@ -751,6 +801,14 @@ body.messagelist
   text-decoration: underline;
 }
 
+#messagelist tr td.attachment,
+#messagelist tr td.threads,
+#messagelist tr td.flag
+{
+  width: 19px;
+  padding: 0 2px;
+}
+
 #messagelist tr td.size
 {
   width: 60px;
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index 3e8d5ef42..d36fd7452 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -32,14 +32,9 @@
     /images/pagenav.gif
     /images/mail_toolbar.png
     /images/searchfield.gif
-    /images/icons/glass_roll.png
+    /images/messageicons.png
     /images/icons/reset.gif
-    /images/icons/attachment.png
-    /images/icons/dot.png
-    /images/icons/unread.png  
-
     /images/abook_toolbar.png
-    /images/icons/glass.png
     /images/icons/groupactions.png
     /images/watermark.gif
 " />
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index a0847283a..840907e5f 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -58,16 +58,6 @@
   cellspacing="0"
   columns=""
   summary="Message list"
-  messageIcon="/images/icons/dot.png"
-  unreadIcon="/images/icons/unread.png"
-  deletedIcon="/images/icons/deleted.png"
-  repliedIcon="/images/icons/replied.png"
-  forwardedIcon="/images/icons/forwarded.png"
-  forwardedrepliedIcon="/images/icons/forwarded_replied.png"
-  attachmentIcon="/images/icons/attachment.png"
-  flaggedIcon="/images/icons/flagged.png"
-  unflaggedIcon="/images/icons/blank.gif"
-  unreadchildrenIcon="" 
   optionsmenuIcon="/images/icons/columnpicker.gif" />
 </div>
 <div class="boxfooter">