6 files changed, 29 insertions, 6 deletions
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 9187c6f46..25bcc0b64 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -7,11 +7,16 @@
 		<roundcube:endif />
 	</div>
 	<div class="topright">
-	<span class="username"><roundcube:object name="username" /></span>
-	<roundcube:button command="logout" label="logout" class="button-logout" />
+	<roundcube:if condition="!env:extwin" />
+		<span class="username"><roundcube:object name="username" /></span>
+		<roundcube:button command="logout" label="logout" class="button-logout" />
+	<roundcube:else />
+		<roundcube:button command="close" label="close" class="closelink" />
+	<roundcube:endif />
 	</div>
 </div>
 
+<roundcube:if condition="!env:extwin" />
 <div id="topnav">
 	<div id="taskbar" class="topright">
 	<roundcube:button command="mail" label="mail" class="button-mail" classSel="button-mail button-selected" innerClass="button-inner" />
@@ -21,6 +26,7 @@
 	</div>
 	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
 </div>
+<roundcube:endif />
 
 <br style="clear:both" />
 </div>
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index a2756638d..b819e777b 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -30,6 +30,10 @@
 	z-index: 3;
 }
 
+#mailview-right.fullwidth {
+	left: 0;
+}
+
 #mailview-top {
 	position: absolute;
 	top: 42px;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 340688078..be43668f6 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -637,6 +637,10 @@ a.iconlink.upload {
 	bottom: 20px;
 }
 
+.extwin #mainscreen {
+	top: 40px;
+}
+
 #mainscreen.offset {
 	top: 130px;
 }
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index d29c1bd2a..33f4ba36b 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" type="text/css" href="/googiespell.css" />
 <roundcube:endif />
 </head>
-<body>
+<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif />
 
 <div class="minwidth">
 <roundcube:include file="/includes/header.html" />
@@ -108,10 +108,11 @@
 </tbody>
 </table>
 
-<div id="composebuttons" class="formbuttons">
+<div id="composebuttons" class="pagenav formbuttons">
 	<roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="11" />
 	<roundcube:button type="input" command="savedraft" class="button" label="savemessage" tabindex="12" />
 	<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="13" />
+	<roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" condition="!env:extwin" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index e99f2066a..92bb3589d 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.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" />
 
@@ -12,14 +12,18 @@
 
 <!-- toolbar -->
 <div id="messagetoolbar" class="toolbar fullwidth">
+<roundcube:if condition="!env:extwin" />
 	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
 	<span class="spacer"></span>
+<roundcube:endif />
 	<roundcube:include file="/includes/mailtoolbar.html" />
 	<div class="toolbarselect">
 		<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" />
 	</div>
 </div>
 
+<roundcube:if condition="!env:extwin" />
+
 <div id="mailview-left">
 
 <!-- folders list -->
@@ -32,6 +36,10 @@
 </div>
 
 <div id="mailview-right" class="offset uibox">
+<roundcube:else />
+
+<div id="mailview-right" class="offset fullwidth uibox">
+<roundcube:endif />
 
 <div id="messageheader">
 <span id="previewheaderstoggle"></span>
diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
index de02b050b..ae1a3acc8 100644
--- a/skins/larry/templates/messagepreview.html
+++ b/skins/larry/templates/messagepreview.html
@@ -36,7 +36,7 @@
 	<roundcube:button command="forward" type="link" class="button forward" classSel="button forward pressed" innerClass="inner" title="forwardmessage" content="-&gt;" />
 	&nbsp;
 <roundcube:endif />
-	<roundcube:button command="permaurl" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" target="_blank" />
+	<roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" />
 </div>
 
 </div>