12 files changed, 24 insertions, 14 deletions
diff --git a/skins/default/includes/header.html b/skins/default/includes/header.html
index bcb6efb37..a7e034a0b 100644
--- a/skins/default/includes/header.html
+++ b/skins/default/includes/header.html
@@ -1,10 +1,3 @@
-<div id="taskbar">
-<roundcube:button command="mail" label="mail" class="button-mail" />
-<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" />
-<roundcube:button command="settings" label="settings" class="button-settings" />
-<roundcube:button command="logout" label="logout" class="button-logout" />
-</div>
-
 <div id="header"><roundcube:button command="mail" image="/images/roundcube_logo.png" alt="RoundCube Webmail" width="165" height="55" /></div>
 
 <roundcube:object name="message" id="message" />
diff --git a/skins/default/includes/taskbar.html b/skins/default/includes/taskbar.html
new file mode 100644
index 000000000..ef1aa8268
--- /dev/null
+++ b/skins/default/includes/taskbar.html
@@ -0,0 +1,6 @@
+<div id="taskbar">
+<roundcube:button command="mail" label="mail" class="button-mail" />
+<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" />
+<roundcube:button command="settings" label="settings" class="button-settings" />
+<roundcube:button command="logout" label="logout" class="button-logout" />
+</div>
+\ No newline at end of file
diff --git a/skins/default/mail.css b/skins/default/mail.css
index c3ee3637c..72c1c6c2b 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -325,6 +325,12 @@ body.messagelist
   font-weight: bold;
 }
 
+#messagelist thead tr td.sortedASC,
+#messagelist thead tr td.sortedDESC
+{
+  background-image: url(images/listheader_dark.gif); 
+}
+
 #messagelist tbody tr td
 {
   height: 16px !important;
diff --git a/skins/default/templates/addidentity.html b/skins/default/templates/addidentity.html
index 96bb6dd5a..6d29cad1d 100644
--- a/skins/default/templates/addidentity.html
+++ b/skins/default/templates/addidentity.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 <roundcube:include file="/includes/settingstabs.html" />
 
@@ -29,7 +30,6 @@
 </div>
 </div>
 
-<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/settingscripts.html" />
 
 </body>
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index b2ed21029..5b66b0594 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 
 <div id="abooktoolbar">
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 5774b78fa..26c9de525 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -24,6 +24,7 @@ function rcmail_toggle_display(id)
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 
 <form name="form" method="post">
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 07283f5be..53d878d1f 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 <roundcube:include file="/includes/settingstabs.html" />
 
@@ -30,7 +31,6 @@
 </div>
 </div>
 
-<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/settingscripts.html" />
 
 </body>
diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
index 7ae2bf007..c96e154fb 100644
--- a/skins/default/templates/identities.html
+++ b/skins/default/templates/identities.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 <roundcube:include file="/includes/settingstabs.html" />
 
@@ -16,7 +17,6 @@
 <p><roundcube:button command="add" type="input" label="newidentity" class="button" /></p>
 </div>
 
-<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/settingscripts.html" />
 
 </body>
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 56d0df66f..783808ded 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 
 <div id="messagetoolbar">
@@ -35,7 +36,9 @@
   messageIcon="/images/icons/dot.png"
   unreadIcon="/images/icons/unread.png"
   repliedIcon="/images/icons/replied.png"
-  attachmentIcon="/images/icons/attachment.png" />
+  attachmentIcon="/images/icons/attachment.png"
+  sortDescButton="/images/buttons/up_arrow.png"
+  sortAscButton="/images/buttons/down_arrow.png" />
 </div>
 
 <div id="listcontrols">
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index a3095c73c..0a9918356 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 <roundcube:include file="/includes/settingstabs.html" />
 
@@ -31,7 +32,6 @@
 
 </form>
 
-<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/settingscripts.html" />
 
 </body>
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 3c276d0d1..a5c46effa 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 
 <div id="messagetoolbar">
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index b29734d5e..879b9cebc 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 <roundcube:include file="/includes/settingstabs.html" />
 
@@ -20,8 +21,6 @@
 </div>
 </div>
 
-
-<roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/settingscripts.html" />
 
 </body>