diff --git a/skins/elastic/README b/skins/elastic/README
index ac3403ba0..f2726d761 100644
--- a/skins/elastic/README
+++ b/skins/elastic/README
@@ -40,6 +40,7 @@ using the `lessc` command line tool. This comes with the `nodejs-less`
 RPM package which depends on nodejs.
 
  $ lessc -x styles/styles.less > styles/styles.css
+ $ lessc -x styles/print.less > styles/print.css
 
 (the -x option minifies the CSS code)
 
diff --git a/skins/elastic/includes/footer.html b/skins/elastic/includes/footer.html
index ec44b3280..26d46dd3d 100644
--- a/skins/elastic/includes/footer.html
+++ b/skins/elastic/includes/footer.html
@@ -1,4 +1,4 @@
-<roundcube:if condition="!env:extwin &amp;&amp; !env:framed" />
+<roundcube:if condition="!env:framed || env:extwin" />
 </div>
 <roundcube:endif />
 
diff --git a/skins/elastic/includes/layout.html b/skins/elastic/includes/layout.html
index 0ec592fa6..a6fa040f9 100644
--- a/skins/elastic/includes/layout.html
+++ b/skins/elastic/includes/layout.html
@@ -1,21 +1,24 @@
+<roundcube:add_label name="errortitle" />
+
 <roundcube:object name="doctype" value="html5" />
 <html>
 <head>
 	<title><roundcube:object name="pagetitle" /></title>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" id="viewport" />
-	<link rel="shortcut icon" href="/images/favicon.ico"/>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" id="viewport">
+	<link rel="shortcut icon" href="/images/favicon.ico">
 	<link rel="stylesheet" href="/bootstrap/bootstrap.min.css">
 	<roundcube:if condition="config:devel_mode" />
-		<link rel="stylesheet/less" type="text/css" href="/styles/styles.less" />
+		<link rel="stylesheet/less" type="text/css" href="/styles/styles.less">
+		<roundcube:link rel="stylesheet/less" type="text/css" href="/styles/print.less" condition="env:action == 'print'" />
 		<script src="/styles/less.min.js" data-env="development"></script>
 	<roundcube:else />
-		<link rel="stylesheet" type="text/css" href="/styles/styles.css" />
+		<link rel="stylesheet" type="text/css" href="/styles/styles.css">
+		<roundcube:link rel="stylesheet" type="text/css" href="/styles/print.css" condition="env:action == 'print'" />
 	<roundcube:endif />
-	<roundcube:add_label name="errortitle" />
 </head>
 <roundcube:if condition="!env:framed || env:extwin" />
-<body class="task-<roundcube:exp expression="env:task ?: 'error'" />">
+<body class="task-<roundcube:exp expression="env:task ?: 'error'">">
 <div id="layout">
 <roundcube:else />
-<body class="iframe task-<roundcube:exp expression="env:task ?: 'error'" />">
+<body class="iframe task-<roundcube:exp expression="env:task ?: 'error'">">
 <roundcube:endif />
diff --git a/skins/elastic/styles/print.less b/skins/elastic/styles/print.less
new file mode 100644
index 000000000..e69de29bb
diff --git a/skins/elastic/templates/contact.html b/skins/elastic/templates/contact.html
index b7fcfeff8..51700cbad 100644
--- a/skins/elastic/templates/contact.html
+++ b/skins/elastic/templates/contact.html
@@ -6,17 +6,14 @@
 	<roundcube:if condition="strlen(env:sourcename)" />
 		<div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
 	<roundcube:endif />
-
 	<div id="contactphoto">
 		<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" placeholderGroup="/images/contactgroup.png" />
 	</div>
 	<roundcube:object name="contacthead" id="contacthead" />
-	<br style="clear:both" />
-
+	<br style="clear:both">
 	<div id="contacttabs" class="tabbed">
 		<roundcube:object name="contactdetails" />
 	</div>
-
 </div>
 
 <div class="formbuttons">
diff --git a/skins/elastic/templates/contactedit.html b/skins/elastic/templates/contactedit.html
index e32f164b4..7b16b189a 100644
--- a/skins/elastic/templates/contactedit.html
+++ b/skins/elastic/templates/contactedit.html
@@ -25,8 +25,7 @@
 	</fieldset>
 
 	<roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
-	<br style="clear:both" />
-
+	<br style="clear:both">
 	<div id="contacttabs" class="tabbed">
 		<roundcube:object name="contacteditform" size="40" textareacols="60" form="editform" />
 	</div>
diff --git a/skins/elastic/templates/contactprint.html b/skins/elastic/templates/contactprint.html
new file mode 100644
index 000000000..19e355ce2
--- /dev/null
+++ b/skins/elastic/templates/contactprint.html
@@ -0,0 +1,14 @@
+<roundcube:include file="/includes/layout.html" />
+
+<div id="content" class="content" role="main">
+	<div id="contact-details">
+		<div id="contactphoto">
+			<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" placeholderGroup="/images/contactgroup.png" />
+		</div>
+		<roundcube:object name="contacthead" id="contacthead" />
+		<br style="clear:both">
+		<roundcube:object name="contactdetails" />
+	</div>
+</div>
+
+<roundcube:include file="/includes/footer.html" />
diff --git a/skins/elastic/templates/messageprint.html b/skins/elastic/templates/messageprint.html
new file mode 100644
index 000000000..08f61cf19
--- /dev/null
+++ b/skins/elastic/templates/messageprint.html
@@ -0,0 +1,11 @@
+<roundcube:include file="/includes/layout.html" />
+
+<div id="content" class="content" role="main">
+	<div id="printmessageframe">
+		<roundcube:object name="messageHeaders" class="headers-table" max="10" />
+		<roundcube:object name="messageAttachments" id="attachment-list" />
+		<roundcube:object name="messageBody" id="messagebody" showImages="false" />
+	</div>
+</div>
+
+<roundcube:include file="/includes/footer.html" />
