7 files changed, 29 insertions, 23 deletions
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 83adaebec..743ad71f4 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1054,6 +1054,14 @@ a.iconlink.upload {
 	bottom: 0;
 }
 
+#mainscreen.offset {
+	top: 132px;
+}
+
+#mainscreen .offset {
+	top: 42px;
+}
+
 .minimal #mainscreen {
 	top: 62px;
 }
@@ -1066,12 +1074,8 @@ a.iconlink.upload {
 	top: 40px;
 }
 
-#mainscreen.offset {
-	top: 132px;
-}
-
-#mainscreen .offset {
-	top: 42px;
+.extwin #mainscreen.offset {
+	top: 86px;
 }
 
 .uibox {
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 153cfc4d7..60ea35525 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index ffb0a7ee1..eed563133 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html
index 5878155c6..163469d16 100644
--- a/skins/larry/templates/identities.html
+++ b/skins/larry/templates/identities.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />
 
@@ -15,7 +15,6 @@
 <roundcube:include file="/includes/settingstabs.html" />
 
 <div id="settings-right" role="main" aria-labelledby="aria-label-identitieslist">
-	
 <div id="identitieslist" class="uibox listbox">
 <h2 class="boxtitle" id="aria-label-identitieslist"><roundcube:label name="identities" /></h2>
 <div class="scroller withfooter">
diff --git a/skins/larry/templates/importcontacts.html b/skins/larry/templates/importcontacts.html
index 2bc1d4a26..f18338cc0 100644
--- a/skins/larry/templates/importcontacts.html
+++ b/skins/larry/templates/importcontacts.html
@@ -4,26 +4,29 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />
 
 <div id="mainscreen">
 
-<div id="addressbooktoolbar" class="toolbar">
+<h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="importcontacts" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="addressbooktoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
 	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
 </div>
 
-<div id="pluginbody" class="offset uibox contentbox">
-<h1 class="boxtitle"><roundcube:label name="importcontacts" /></h1>
+<div id="mainscreencontent" class="uibox contentbox">
+	<h2 class="boxtitle"><roundcube:label name="importcontacts" /></h2>
 
-<div id="import-box" class="boxcontent">
-<roundcube:object name="importstep" class="propform" />
-<br/>
-<p class="formbuttons">
-	<roundcube:object name="importnav" class="button" />
-</p>
-</div>
+	<div id="import-box" class="boxcontent">
+		<roundcube:object name="importstep" class="propform" />
+		<br/>
+		<p class="formbuttons">
+		<roundcube:object name="importnav" class="button" />
+		</p>
+	</div>
 
 </div>
 </div>
diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html
index 538a025f0..8f91a8f65 100644
--- a/skins/larry/templates/responses.html
+++ b/skins/larry/templates/responses.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index 406b9c9b3..34c3440cc 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="noscroll">
+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />