5 files changed, 23 insertions, 2 deletions
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index 385d2686f..0b263e9fe 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -12,6 +12,8 @@
 
 <roundcube:include file="/includes/settingstabs.html" />
 
+<div id="settings-right">
+
 <div id="folderslist" class="uibox listbox">
 <h2 class="boxtitle"><span style="float:right"><roundcube:label name="subscribed" /></span><roundcube:label name="folders" /></h2>
 <div class="scroller withfooter">
@@ -29,6 +31,8 @@
 
 </div>
 
+</div>
+
 <div id="mailboxmenu" class="popupmenu">
 	<ul class="toolbarmenu" id="mailboxoptionsmenu">
 		<li><roundcube:button command="delete-folder" label="delete" classAct="active" /></li>
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html
index 53d7539bc..905bc100a 100644
--- a/skins/larry/templates/identities.html
+++ b/skins/larry/templates/identities.html
@@ -12,6 +12,8 @@
 
 <roundcube:include file="/includes/settingstabs.html" />
 
+<div id="settings-right">
+	
 <div id="identitieslist" class="uibox listbox">
 <h2 class="boxtitle"><roundcube:label name="identities" /></h2>
 <div class="scroller withfooter">
@@ -28,6 +30,8 @@
 
 </div>
 
+</div>
+
 <roundcube:include file="/includes/footer.html" />
 
 </body>
diff --git a/skins/larry/templates/identityedit.html b/skins/larry/templates/identityedit.html
index 147098286..d31c4a6e7 100644
--- a/skins/larry/templates/identityedit.html
+++ b/skins/larry/templates/identityedit.html
@@ -12,6 +12,8 @@
 
 <roundcube:include file="/includes/settingstabs.html" />
 
+<div id="settings-right">
+
 <div id="identitieslist" class="uibox listbox">
 <h2 class="boxtitle"><roundcube:label name="identities" /></h2>
 <div class="scroller withfooter">
@@ -39,6 +41,8 @@
 
 </div>
 
+</div>
+
 <roundcube:include file="/includes/footer.html" />
 
 </body>
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 88b7c5840..87e690b54 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -64,8 +64,13 @@
 <!-- list footer -->
 <div id="messagelistfooter">
 	<div id="listcontrols">
-		<a href="#list" class="iconbutton listmode" id="maillistmode" title="<roundcube:label name='list' />">List</a>
-		<a href="#threads" class="iconbutton threadmode" id="mailthreadmode" title="<roundcube:label name='threads' />">Threads</a>
+		<roundcube:if condition="env:threads" />
+			<a href="#list" class="iconbutton listmode" id="maillistmode" title="<roundcube:label name='list' />">List</a>
+			<a href="#threads" class="iconbutton threadmode" id="mailthreadmode" title="<roundcube:label name='threads' />">Threads</a>
+		<roundcube:else />
+			<a href="#list" class="iconbutton listmode selected" title="<roundcube:label name='list' />" onclick="return false">List</a>
+			<a href="#threads" class="iconbutton threadmode disabled" title="<roundcube:label name='threads' />" onclick="return false">Threads</a>
+		<roundcube:endif />
 	</div>
 
 	<div id="countcontrols" class="pagenav dark">
diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index bd90ae38e..15ce1e94f 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -12,6 +12,8 @@
 
 <roundcube:include file="/includes/settingstabs.html" />
 
+<div id="settings-right">
+
 <div id="sectionslist" class="uibox listbox">
 <div class="scroller">
 	<roundcube:object name="sectionslist" id="sections-table" class="listing" />
@@ -25,6 +27,8 @@
 
 </div>
 
+</div>
+
 <roundcube:include file="/includes/footer.html" />
 
 </body>