4 files changed, 69 insertions, 11 deletions
diff --git a/skins/default/mail.css b/skins/default/mail.css
index d94d6a1f8..5bf05cb99 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -120,6 +120,33 @@
   height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
 }
 
+#mailpreviewframe
+{
+  position: absolute;
+  top: 300px;
+  left: 200px;
+  right: 40px;
+  bottom: 40px;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  /* css hack for IE */
+  width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-340)+'px');
+}
+
+#messagecontframe
+{
+  width: 100%;
+  height: 100%;
+  border: 0;
+}
+
+/*\*/
+html>body*#messagecontframe
+{
+  height: 40%;
+}
+/**/
 
 #messagepartframe
 {
@@ -385,8 +412,7 @@ body.messagelist
 
 #messagelist tbody tr td
 {
-  height: 16px !important;
-  height: 20px;
+  height: 16px;
   padding: 2px;
   padding-right: 4px;
   font-size: 11px;
@@ -461,12 +487,6 @@ body.messagelist
   background-color: #CC3333;
 }
 
-#messagelist tr.focused td
-{
-  border-bottom: thin dotted;
-  border-top: thin dotted;
-}
-
 #messagelist tr.unfocused td
 {
   font-weight: bold;
@@ -575,7 +595,7 @@ html>body*#quicksearchbar #quicksearchbox { width: 180px; top:0px; right: 1px; l
 #messageframe
 {
   position: absolute;
-  top: 85px;
+  top: 95px;
   left: 200px;
   right: 40px;
   bottom: 40px;
@@ -588,6 +608,12 @@ html>body*#quicksearchbar #quicksearchbox { width: 180px; top:0px; right: 1px; l
   height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
 }
 
+div.messageheaderbox
+{
+  margin: 6px 8px 0px 8px;
+  border: 1px solid #ccc;
+}
+
 table.headers-table
 {
   width: 100%;
diff --git a/skins/default/settings.css b/skins/default/settings.css
index c172576fd..ba5b65b31 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -49,7 +49,7 @@ span.tablink-selected a
   position: absolute;
   top: 95px;
   left: 20px;
-  width: 550px;
+  width: 600px;
   border: 1px solid #999999;  
 }
 
@@ -78,7 +78,7 @@ span.tablink-selected a
 
 #identities-table
 {
-  width: 500px;
+  width: 600px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
 }
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 6d95d6058..7e83057c5 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -54,6 +54,19 @@
   attachmentIcon="/images/icons/attachment.png" />
 </div>
 
+<roundcube:if condition="config:preview_pane == true" />
+<div id="mailpreviewframe">
+<roundcube:object name="messagecontentframe" id="messagecontframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+
+<style type="text/css">
+#mailcontframe {
+  bottom: auto;
+  height: 210px;
+}
+</style>
+<roundcube:endif />
+
 <div id="listcontrols">
 <roundcube:label name="select" />:&nbsp;
 <roundcube:button command="select-all" label="all" classAct="active" />&nbsp;
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html
new file mode 100644
index 000000000..e08f2c7ec
--- /dev/null
+++ b/skins/default/templates/messagepreview.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<link rel="stylesheet" type="text/css" href="/common.css" />
+<link rel="stylesheet" type="text/css" href="/mail.css" />
+</head>
+<body class="iframe">
+
+<div class="messageheaderbox">
+<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>
+
+<roundcube:object name="blockedObjects" id="remote-objects-message" />
+<roundcube:object name="messageBody" id="messagebody" />
+
+</body>
+</html>