3 files changed, 23 insertions, 6 deletions
diff --git a/skins/default/images/icons/extwin.png b/skins/default/images/icons/extwin.png
new file mode 100644
index 000000000..1ab4d7703
--- /dev/null
+++ b/skins/default/images/icons/extwin.png
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 7f76ed85b..1502bd22d 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -632,6 +632,7 @@ html>body*#messagelist[id$="messagelist"]:not([class="none"]) { table-layout: au
 
 div.messageheaderbox
 {
+  position: relative;
   margin: 6px 8px 0px 8px;
   border: 1px solid #ccc;
 }
@@ -651,6 +652,11 @@ table.headers-table
   border: 1px solid #ccc;
 }
 
+#messageframe table.headers-table
+{
+  border-bottom: 1px solid #ccc;
+}
+
 table.headers-table tr td
 {
   font-size: 11px;
@@ -813,6 +819,15 @@ div.message-htmlpart div.rcmBody
   color: #333333;
 }
 
+#messageviewlink
+{
+  position: absolute;
+  top: 1px;
+  right: 1px;
+  width: 15px;
+  height: 15px;
+  border: 0;
+}
 
 /** message compose styles */
 
@@ -978,19 +993,20 @@ div.message-htmlpart div.rcmBody
   margin-top: 4px;
 }
 
-.more-headers
+table.headers-table tr td.more-headers
 {
   cursor: pointer;
   width: 100%;
-  height: 6px;
+  height: 8px;
+  border-bottom: 0;
 }
 
-.show-headers
+td.show-headers
 {
   background: url(images/icons/down_small.gif) no-repeat center;
 }
 
-.hide-headers
+td.hide-headers
 {
   background: url(images/icons/up_small.gif) no-repeat center;
 }
@@ -1004,7 +1020,7 @@ div.message-htmlpart div.rcmBody
 #headers-source
 {
   margin: 0 5px;
-  width: 100%;
+  padding: 0.5em;
   height: 145px;
   background: white;
   overflow: auto;
@@ -1013,7 +1029,7 @@ div.message-htmlpart div.rcmBody
   border: 1px solid #999999;
   display: none;
   text-align: left;
-  color: #666666;
+  color: #333;
 }
 
 font.bold
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html
index e08f2c7ec..24848bbe7 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/default/templates/messagepreview.html
@@ -8,6 +8,7 @@
 <body class="iframe">
 
 <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/plus.gif" summary="Message headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />
 </div>