6 files changed, 49 insertions, 29 deletions
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index ebdce51be..97efdc6f3 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -24,6 +24,15 @@
 	<roundcube:container name="toolbar" id="addressbooktoolbar" />
 </div>
 
+<!-- search box -->
+<div id="quicksearchbar" class="searchbox">
+<roundcube:object name="searchform" id="quicksearchbox" />
+<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
+<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+</div>
+
+<div id="mainscreencontent">
+
 <div id="addressview-left">
 
 <!-- sources/groups list -->
@@ -41,13 +50,6 @@
 
 <div id="addressview-right">
 
-<!-- search box -->
-<div id="quicksearchbar" class="searchbox">
-<roundcube:object name="searchform" id="quicksearchbox" />
-<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
-<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
-</div>
-
 <!-- contacts list -->
 <div id="addresslist" class="uibox listbox">
 <roundcube:object name="addresslisttitle" label="contacts" tag="h2" class="boxtitle" />
@@ -73,9 +75,10 @@
 	</div>
 </div>
 
-
 </div><!-- end addressview-right -->
 
+</div><!-- end mainscreencontent -->
+
 </div><!-- end mainscreen -->
 
 <div id="exportmenu" class="popupmenu">
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 11662d185..a7f2e7e2f 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -35,6 +35,8 @@
 </div>
 </div>
 
+<div id="mainscreencontent">
+
 <div id="composeview-left">
 
 <!-- inline address book -->
@@ -181,6 +183,8 @@
 
 </div><!-- end mailview-right -->
 
+</div><!-- end mainscreencontent -->
+
 </div><!-- end mainscreen -->
 
 <div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />">
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index ff5f7549c..b4e216a09 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -11,9 +11,8 @@
 <roundcube:endif />
 </style>
 </head>
-<body>
+<body class="minwidth">
 
-<div class="minwidth">
 <roundcube:include file="/includes/header.html" />
 
 <div id="mainscreen">
@@ -24,6 +23,23 @@
 	<roundcube:include file="/includes/mailtoolbar.html" />
 </div>
 
+<div id="messagesearchtools">
+
+<!-- search filter -->
+<div id="searchfilter">
+	<roundcube:object name="searchfilter" class="searchfilter decorated" />
+</div>
+
+<!-- search box -->
+<div id="quicksearchbar" class="searchbox">
+<roundcube:object name="searchform" id="quicksearchbox" />
+<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
+<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+</div>
+
+</div>
+
+<div id="mainscreencontent">
 <div id="mailview-left">
 
 <!-- folders list -->
@@ -43,22 +59,6 @@
 
 <div id="mailview-right">
 
-<div id="messagesearchtools">
-
-<!-- search filter -->
-<div id="searchfilter">
-	<roundcube:object name="searchfilter" class="searchfilter decorated" />
-</div>
-
-<!-- search box -->
-<div id="quicksearchbar" class="searchbox">
-<roundcube:object name="searchform" id="quicksearchbox" />
-<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
-<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
-</div>
-
-</div>
-
 <roundcube:if condition="config:preview_pane == true" />
 <div id="mailview-top" class="uibox">
 <roundcube:else />
@@ -119,9 +119,9 @@
 
 </div><!-- end mailview-right -->
 
-</div><!-- end mainscreen -->
+</div><!-- end mainscreencontent -->
 
-</div><!-- end minwidth -->
+</div><!-- end mainscreen -->
 
 <div id="searchmenu" class="popupmenu">
 	<ul class="toolbarmenu">
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index df92b7511..0343004f6 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -20,6 +20,8 @@
 
 <roundcube:if condition="!env:extwin" />
 
+<div id="mainscreencontent">
+
 <div id="mailview-left">
 
 <!-- folders list -->
@@ -31,7 +33,7 @@
 
 </div>
 
-<div id="mailview-right" class="offset uibox">
+<div id="mailview-right" class="uibox">
 <roundcube:else />
 <roundcube:object name="mailboxlist" folder_filter="mail" type="js" />
 
@@ -84,6 +86,10 @@
 
 </div><!-- end mailview-right -->
 
+<roundcube:if condition="!env:extwin" />
+</div><!-- end mainscreencontent -->
+<roundcube:endif />
+
 </div><!-- end mainscreen -->
 
 <div id="attachmentmenu" class="popupmenu">
diff --git a/skins/larry/templates/messageerror.html b/skins/larry/templates/messageerror.html
index dbe373a12..d509ce804 100644
--- a/skins/larry/templates/messageerror.html
+++ b/skins/larry/templates/messageerror.html
@@ -23,6 +23,8 @@
 	</div>
 </div>
 
+<div id="mainscreencontent">
+
 <div id="mailview-left">
 
 <!-- folders list -->
@@ -40,6 +42,8 @@
 
 </div><!-- end mailview-right -->
 
+</div><!-- end mainscreencontent -->
+
 </div><!-- end mainscreen -->
 
 <roundcube:include file="/includes/footer.html" />
diff --git a/skins/larry/templates/messagepart.html b/skins/larry/templates/messagepart.html
index 0ec935873..3b878c9d7 100644
--- a/skins/larry/templates/messagepart.html
+++ b/skins/larry/templates/messagepart.html
@@ -16,6 +16,8 @@
 	<roundcube:container name="toolbar" id="messagetoolbar" />
 </div>
 
+<div id="mainscreencontent">
+
 <div id="messagepartheader" class="uibox listbox">
 	<h2 class="boxtitle"><roundcube:label name="properties" /></h2>
 	<div class="scroller">
@@ -30,6 +32,7 @@
 </div>
 
 </div>
+</div>
 
 <roundcube:include file="/includes/footer.html" />