diff --git a/skins/elastic/includes/layout.html b/skins/elastic/includes/layout.html
index 3b767a9cc..0ec592fa6 100644
--- a/skins/elastic/includes/layout.html
+++ b/skins/elastic/includes/layout.html
@@ -13,9 +13,9 @@
 	<roundcube:endif />
 	<roundcube:add_label name="errortitle" />
 </head>
-<roundcube:if condition="!env:framed" />
-<body class="task-<roundcube:var name="env:task" />">
+<roundcube:if condition="!env:framed || env:extwin" />
+<body class="task-<roundcube:exp expression="env:task ?: 'error'" />">
 <div id="layout">
 <roundcube:else />
-<body class="iframe task-<roundcube:var name="env:task" />">
+<body class="iframe task-<roundcube:exp expression="env:task ?: 'error'" />">
 <roundcube:endif />
diff --git a/skins/elastic/includes/mail-menu.html b/skins/elastic/includes/mail-menu.html
index f7c2dd4bc..ebc785d78 100644
--- a/skins/elastic/includes/mail-menu.html
+++ b/skins/elastic/includes/mail-menu.html
@@ -42,8 +42,8 @@
 <div id="forward-menu" class="ui popup">
 	<h3 id="aria-label-forwardmenu" class="voice"><roundcube:label name="arialabelforwardingoptions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-forwardmenu">
-		<roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" />
-		<roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" />
+		<roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" classAct="forward active" class="forward" />
+		<roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachment active" class="forwardattachment" />
 		<roundcube:container name="forwardmenu" id="forward-menu" />
 	</ul>
 </div>
@@ -51,8 +51,8 @@
 <div id="replyall-menu" class="ui popup">
 	<h3 id="aria-label-replyallmenu" class="voice"><roundcube:label name="arialabelreplyalloptions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-replyallmenu">
-		<roundcube:button type="link-menuitem" command="reply-all" label="replyall" prop="sub" class="replyalllink" classAct="replyalllink active" />
-		<roundcube:button type="link-menuitem" command="reply-list" label="replylist" prop="sub" class="replylistlink" classAct="replylistlink active" />
+		<roundcube:button type="link-menuitem" command="reply-all" label="replyall" prop="sub" class="replyall" classAct="replyall active" />
+		<roundcube:button type="link-menuitem" command="reply-list" label="replylist" prop="sub" class="replylist" classAct="replylist active" />
 		<roundcube:container name="replyallmenu" id="replyall-menu" />
 	</ul>
 </div>
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index 912c209c7..0c07061e0 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -142,7 +142,7 @@
 .toolbar a.button.back:before {
     content: @fa-var-arrow-left;
 }
-.toolbar a.button.close:before {
+.toolbar a.button.closewin:before {
     content: @fa-var-window-close;
 }
 .toolbar a.button.save:before {
diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index ecab9c315..0cd6ee737 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -1,5 +1,5 @@
 <roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
+<roundcube:include file="/includes/menu.html" condition="!env:extwin && !env:framed" />
 
 <h1 class="voice"><roundcube:object name="pagetitle" /></h1>
 
@@ -47,7 +47,7 @@
 		<div id="messagetoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
 			<roundcube:button command="list" type="link" class="button back disabled" classAct="button back"
 				label="cancel" condition="!env:extwin" tabindex="2" innerclass="inner" />
-			<roundcube:button command="close" type="link" class="button close disabled" classAct="button close"
+			<roundcube:button command="close" type="link" class="button closewin disabled" classAct="button closewin"
 				label="cancel" condition="env:extwin" tabindex="2" innerclass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="send" type="link" class="button send disabled" classAct="button send"
diff --git a/skins/elastic/templates/message.html b/skins/elastic/templates/message.html
index 7318a14a4..b92cd6701 100644
--- a/skins/elastic/templates/message.html
+++ b/skins/elastic/templates/message.html
@@ -1,4 +1,6 @@
 <roundcube:include file="/includes/layout.html" />
+<roundcube:include file="/includes/menu.html" condition="!env:framed && !env:extwin" />
+
 <roundcube:object name="mailboxlist" folder_filter="mail" type="js" />
 
 <h1 class="voice"><roundcube:object name="messageHeaders" valueOf="subject" /></h1>
diff --git a/skins/elastic/templates/messageerror.html b/skins/elastic/templates/messageerror.html
index f6fa3dafb..087538287 100644
--- a/skins/elastic/templates/messageerror.html
+++ b/skins/elastic/templates/messageerror.html
@@ -1,7 +1,5 @@
 <roundcube:include file="/includes/layout.html" />
-<roundcube:if condition="env:action == 'show'" />
-	<roundcube:include file="/includes/menu.html" />
-<roundcube:endif />
+<roundcube:include file="/includes/menu.html" condition="!env:framed && !env:extwin" />
 
 <h1 class="voice"><roundcube:label name="messageopenerror" /></h1>
 
diff --git a/skins/elastic/templates/messagepart.html b/skins/elastic/templates/messagepart.html
new file mode 100644
index 000000000..8081fc1c6
--- /dev/null
+++ b/skins/elastic/templates/messagepart.html
@@ -0,0 +1,87 @@
+<roundcube:include file="/includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
+
+<div id="sidebar" class="sidebar listbox">
+	<div class="header">
+		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
+	</div>
+	<roundcube:object name="messagePartControls" class="listing" role="contentinfo"
+		aria-labelledby="aria-label-contentinfo" />
+</div>
+
+<div id="content" class="content selected">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+		<div id="messagetoolbar" class="toolbar">
+			<roundcube:button command="download" type="link" label="download" title="download"
+				class="button download disabled" classAct="button download" innerclass="inner" />
+			<roundcube:button command="print" type="link" label="print" title="print"
+				class="button print disabled" classAct="button print" innerclass="inner" />
+			<roundcube:container name="toolbar" id="messagetoolbar" />
+			<roundcube:if condition="env:is_message" />
+				<span class="spacer"></span>
+				<roundcube:button command="reply" type="link"
+					class="button reply disabled" classAct="button reply"
+					label="reply" title="replytomessage" innerclass="inner" />
+				<span class="dropbutton">
+					<roundcube:button command="reply-all" type="link"
+						class="button reply-all disabled" classAct="button reply-all"
+						label="replyall" title="replytoallmessage" innerclass="inner" />
+					<a href="#reply-all" id="replyallmenulink" class="button dropdown" data-popup="replyall-menu" tabindex="0">
+						<span class="inner"><roundcube:label name="arialabelreplyalloptions" /></span>
+					</a>
+				</span>
+				<span class="dropbutton">
+					<roundcube:button command="forward" type="link"
+						class="button forward disabled" classAct="button forward"
+						label="forward" title="forwardmessage" innerclass="inner" />
+					<a href="#forward" id="forwardmenulink" class="button dropdown" data-popup="forward-menu" tabindex="0">
+						<span class="inner"><roundcube:label name="arialabelforwardingoptions" /></span>
+					</a>
+				</span>
+				<span class="spacer"></span>
+				<roundcube:button name="messagemenulink" id="messagemenulink" type="link"
+					class="button more" label="more" title="moreactions"
+					data-popup="message-menu" innerclass="inner" />
+						<roundcube:endif />
+			<roundcube:endif />
+		</div>
+	</div>
+	<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
+	<roundcube:object name="messagePartFrame" id="messagepartframe" title="arialabelattachmentpreview"
+		role="main" aria-labelledby="aria-label-messagepart" />
+</div>
+
+<roundcube:if condition="env:is_message" />
+	<div id="forward-menu" class="ui popup" aria-hidden="true">
+		<h3 id="aria-label-forwardmenu" class="voice"><roundcube:label name="arialabelforwardingoptions" /></h3>
+		<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-forwardmenu">
+			<roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" classAct="forward active" class="forward" />
+			<roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachment active" class="forwardattachment" />
+			<roundcube:container name="forwardmenu" id="forwardmenu-menu" />
+		</ul>
+	</div>
+
+	<div id="replyall-menu" class="ui popup" aria-hidden="true">
+		<h3 id="aria-label-replyallmenu" class="voice"><roundcube:label name="arialabelreplyalloptions" /></h3>
+		<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-replyallmenu">
+			<roundcube:button type="link-menuitem" command="reply-all" label="replyall" prop="sub" class="replyall" classAct="replyall active" />
+			<roundcube:button type="link-menuitem" command="reply-list" label="replylist" prop="sub" class="replylist" classAct="replylist active" />
+			<roundcube:container name="replyallmenu" id="replyallmenu-menu" />
+		</ul>
+	</div>
+
+	<div id="message-menu" class="ui popup" aria-hidden="true">
+		<h3 id="aria-label-messagemenu" class="voice"><roundcube:label name="arialabelmoremessageactions" /></h3>
+		<ul class="toolbarmenu listing iconized" role="menu" aria-labelledby="aria-label-messagemenu">
+			<roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="edit asnew" classAct="edit asnew active" />
+			<roundcube:button type="link-menuitem" command="viewsource" label="viewsource" class="source" classAct="source active" />
+			<roundcube:container name="messagemenu" id="messagemenu-menu" />
+		</ul>
+	</div>
+<roundcube:endif />
+
+<roundcube:include file="/includes/footer.html" />
