3 files changed, 31 insertions, 45 deletions
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 89b7bd808..1becd711a 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -24,38 +24,20 @@
 
 <!-- folders list -->
 <div id="mailboxcontainer" class="uibox listbox">
-    <div class="scroller">
-        <roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
-    </div>
+<div class="scroller">
+<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
+</div>
 </div>
 
-</div><!-- end mailview-left -->
-
-<div id="mailview-right" class="uibox" style="top: 42px">
-
-<div id="messagecontent">
-
-<div id="messageheader">
-<h3 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h3>
-
-<a href="#details" id="previewheaderstoggle"><span class="iconlink"></span><span id="headerstoggleall" class="iconlink allheaders"></span></a>
+</div>
 
-<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
+<div id="mailview-right">
 
-<table class="headers-table" id="preview-shortheaders"><tbody><tr>
-<roundcube:if condition="env:mailbox == config:drafts_mbox || env:mailbox == config:sent_mbox">
-	<td class="header-title"><roundcube:label name="to" /></td>
-	<td class="header from"><roundcube:object name="messageHeaders" valueOf="to" addicon="/images/addcontact.png" /></td>
-<roundcube:else />
-	<td class="header-title"><roundcube:label name="from" /></td>
-	<td class="header from"><roundcube:object name="messageHeaders" valueOf="from" addicon="/images/addcontact.png" /></td>
-<roundcube:endif />
-	<td class="header-title"><roundcube:label name="date" /></td>
-	<td class="header from"><roundcube:object name="messageHeaders" valueOf="date" /></td>
-</tr></tbody></table>
-
-<roundcube:object name="messageHeaders" id="preview-allheaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject,replyto" />
-<roundcube:object name="messageFullHeaders" no-switch="true" />
+<div id="mailview-top">
+<div id="messageheader" class="uibox">
+<h2 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h2>
+<roundcube:object name="messageHeaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject" />
+<roundcube:object name="messageFullHeaders" id="full-headers" />
 
 <!-- record navigation -->
 <div id="countcontrols" class="pagenav">
@@ -64,21 +46,24 @@
 	<roundcube:button command="nextmessage" type="link" class="button nextpage disabled" classAct="button nextpage" classSel="button nextpage pressed" innerClass="inner" title="nextmessage" content="&amp;gt;" />
 </div>
 
-</div><!-- end messageheader -->
+<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
+</div>
 
-<div id="messagepreview">
-    <div class="rightcol">
-        <roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
-    </div>
-    <div class="leftcol">
-        <roundcube:object name="messageObjects" id="message-objects" />
-        <roundcube:object name="messageBody" id="messagebody" />
-    </div>
+<div id="messagecontent" class="uibox">
+<div class="rightcol">
+<roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
+</div>
+<div class="leftcol">
+<roundcube:object name="messageObjects" id="message-objects" />
+<roundcube:object name="messageBody" id="messagebody" />
+</div>
 </div>
 
-</div><!-- end messagecontent -->
+</div><!-- end mailview-top -->
 
+<div id="mailview-bottom" class="uibox">
 <roundcube:object name="message" id="message" class="statusbar" />
+</div>
 
 </div><!-- end mailview-right -->
 
diff --git a/skins/larry/templates/messageerror.html b/skins/larry/templates/messageerror.html
index 2f5243200..70181f174 100644
--- a/skins/larry/templates/messageerror.html
+++ b/skins/larry/templates/messageerror.html
@@ -27,6 +27,8 @@
 
 </div>
 
+<div id="mailview-right">
+
 <!-- toolbar -->
 <div id="messagetoolbar" class="fullwidth">
 	<div id="mailtoolbar" class="toolbar">
@@ -34,11 +36,11 @@
 	</div>
 </div>
 
-<div id="mailview-right" class="uibox" style="top: 42px">
-
-<div id="messagecontent" class="watermark"></div>
+<div id="mailview-top" class="uibox watermark"></div>
 
-<roundcube:object name="message" id="message" class="statusbar" />
+<div id="mailview-bottom" class="uibox">
+	<roundcube:object name="message" id="message" class="statusbar" />
+</div>
 
 </div><!-- end mailview-right -->
 
diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
index 74c414b0d..b53683ec1 100644
--- a/skins/larry/templates/messagepreview.html
+++ b/skins/larry/templates/messagepreview.html
@@ -6,10 +6,10 @@
 </head>
 <body class="iframe fullheight">
 
-<div id="messageheader">
+<div id="messagepreviewheader">
 <h3 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h3>
 
-<a href="#details" id="previewheaderstoggle"><span class="iconlink"></span><span id="headerstoggleall" class="iconlink allheaders"></a>
+<a href="#details" id="previewheaderstoggle"><span class="iconlink"></span></a>
 <div id="contactphoto"><roundcube:object name="contactphoto" /></div>
 
 <table class="headers-table" id="preview-shortheaders"><tbody><tr>
@@ -25,7 +25,6 @@
 </tr></tbody></table>
 
 <roundcube:object name="messageHeaders" id="preview-allheaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject,replyto" />
-<roundcube:object name="messageFullHeaders" no-switch="true" />
 
 <!-- record navigation -->
 <div id="countcontrols" class="pagenav">