3 files changed, 42 insertions, 35 deletions
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 30572299e..129ed44ec 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -383,6 +383,11 @@
   border-bottom: 1px solid #EBEBEB;
 }
 
+#mailboxlist li ul li:last-child
+{
+  border-bottom: none;
+}
+
 #mailboxlist li div
 {
   position: absolute;
@@ -1007,17 +1012,12 @@ table.headers-table
   background-color: #EBEBEB;
 }
 
+#messagebody #full-headers,
 #messagebody table.headers-table
 {
   width: auto;
   margin: 6px 8px;
   background-color: #F4F4F4;
-  border: 1px solid #ccc;
-}
-
-#messageframe table.headers-table
-{
-  border-bottom: 1px solid #ccc;
 }
 
 table.headers-table tr td
@@ -1033,7 +1033,7 @@ table.headers-table tr td.header-title
   font-weight: bold;
   text-align: right;
   white-space: nowrap;
-  padding: 0 4px;
+  padding: 0 4px 0 8px;
 }
 
 table.headers-table tr td.header
@@ -1046,25 +1046,6 @@ table.headers-table tr td.subject
   font-weight: bold;
 }
 
-table.headers-table tr td.all
-{
-  width: 100%;
-  color: #666666;
-  text-align: left;
-  padding-right: 10px;
-  text-align: center;
-  padding: 2px 6px 4px 6px;
-  border-bottom: 0;
-}
-
-table.headers-table tr td.more-headers
-{
-  cursor: pointer;
-  width: 100%;
-  height: 8px;
-  border-bottom: 0;
-}
-
 #attachment-list
 {
   margin: 0;
@@ -1075,6 +1056,16 @@ table.headers-table tr td.more-headers
   background: url(images/icons/attachment.png) 4px 2px no-repeat #DFDFDF;
 }
 
+#messageframe #attachment-list
+{
+  border-bottom: 1px solid #ccc;
+}
+
+.messageheaderbox #attachment-list
+{
+  border-top: 1px solid #ccc;
+}
+
 #attachment-list:after
 {
   content: ".";
@@ -1210,31 +1201,45 @@ div.message-htmlpart div.rcmBody
   border: 0;
 }
 
-td.show-headers
+#full-headers
 {
-  background: url(images/icons/down_small.gif) no-repeat center;
+  color: #666666;
+  text-align: center;
+  padding: 2px 6px;
+  border-bottom: 1px solid #ccc;
+  background-color: #EBEBEB;
 }
 
-td.hide-headers
+.messageheaderbox #full-headers
 {
-  background: url(images/icons/up_small.gif) no-repeat center;
+  border-bottom: 0;
 }
 
-#all-headers
+div.more-headers
 {
-  height: 150px;
-  display: none;
+  cursor: pointer;
+  height: 8px;
+  border-bottom: 0;
+}
+
+div.show-headers
+{
+  background: url(images/icons/down_small.gif) no-repeat center;
+}
+
+div.hide-headers
+{
+  background: url(images/icons/up_small.gif) no-repeat center;
 }
 
 #headers-source
 {
-  margin: 0 5px;
+  margin: 0 0 2px 0;
   padding: 0.5em;
   height: 145px;
   background: white;
   overflow: auto;
   font-size: 11px;
-  white-space: nowrap;
   border: 1px solid #999999;
   display: none;
   text-align: left;
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 8e8af931f..d59210c40 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -50,6 +50,7 @@
 <div id="messageframe">
 <div class="boxlistcontent" style="top:0; overflow-x:auto">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
+<roundcube:object name="messageFullHeaders" id="full-headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />
 
 <roundcube:object name="blockedObjects" id="remote-objects-message" />
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html
index fbece6bc3..bfd7d7d92 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/default/templates/messagepreview.html
@@ -9,6 +9,7 @@
 <div class="messageheaderbox">
 <roundcube:button command="permaurl" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" />
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
+<roundcube:object name="messageFullHeaders" id="full-headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />
 </div>