diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index 3e8dbb245..155148f41 100644
Binary files a/skins/larry/images/buttons.png and b/skins/larry/images/buttons.png differ
diff --git a/skins/larry/images/messages.png b/skins/larry/images/messages.png
index a5b1eb1d0..5144a66b1 100644
Binary files a/skins/larry/images/messages.png and b/skins/larry/images/messages.png differ
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index efee660d5..f5cf752cd 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -664,6 +664,61 @@ h3.subject {
 	height: 13px;
 }
 
+#full-headers {
+	position: relative;
+	color: #666;
+	text-align: center;
+	background-color: #EBEBEB;
+}
+
+div.more-headers {
+	cursor: pointer;
+	height: 10px;
+	background: url(images/buttons.png) center -1539px no-repeat;
+}
+
+div.hide-headers {
+	background-position: center -1549px;
+}
+
+#all-headers {
+	position: absolute;
+	top: 11px;
+	left: 10px;
+	right: 10px;
+	height: 180px;
+	z-index: 500;
+	border: 1px solid #bbb;
+	border-top: 0;
+	border-radius: 0 0 4px 4px;
+	-webkit-box-shadow: 0px 3px 4px 0px rgba(80, 80, 80, 0.6);
+	-moz-box-shadow: 0px 3px 4px 0px rgba(80, 80, 80, 0.6);
+	box-shadow: 0px 3px 4px 0px rgba(80, 80, 80, 0.6);
+	background: #fff;
+	background: -moz-linear-gradient(top, #f3f3f3 0%, #fff 8px, #fff 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f3f3f3), color-stop(8px,#fff), color-stop(100%,#fff));
+	background: -o-linear-gradient(top, #f3f3f3 0%, #fff 8px, #fff 100%);
+	background: -ms-linear-gradient(top, #f3f3f3 0%, #fff 8px, #fff 100%);
+	background: linear-gradient(top,  #f3f3f3 0%, #fff 8px, #fff 100%);
+}
+
+#all-headers .ui-resizable-s {
+	bottom: -2px;
+}
+
+#headers-source {
+	display: none;
+	position: absolute;
+	top: 8px;
+	left: 0;
+	right: 0;
+	bottom: 8px;
+	padding: 0 10px;
+	overflow: auto;
+	text-align: left;
+	color: #333;
+}
+
 #messagepreviewheader {
 	margin: 0 8px;
 	padding-bottom: 8px;
@@ -730,8 +785,9 @@ h3.subject {
 	color: #960;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
-	background-position: 5px -24px;
+	background-position: 5px -85px;
 	padding: 6px 12px 4px 30px;
+	white-space: normal;
 }
 
 #message-objects div a.button,
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 412e5c3b5..198d64773 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -65,6 +65,9 @@ select.selector {
 	padding: 2px 4px;
 }
 
+.bold {
+	font-weight: bold;
+}
 
 /*** buttons ***/
 
@@ -395,7 +398,7 @@ a.iconlink.upload {
 
 #message div.warning {
 	color: #960;
-	background-position: 0 -25px;
+	background-position: 0 -86px;
 }
 
 #message div.error {
@@ -405,7 +408,7 @@ a.iconlink.upload {
 
 #message div.confirmation {
 	color: #093;
-	background-position: 0 -86px;
+	background-position: 0 -25px;
 }
 
 #message div.loading {
@@ -1225,12 +1228,12 @@ ul.proplist li {
 	top: 0;
 	height: 42px;
 	width: 18px;
-	background: url(images/buttons.png) -24px -1255px no-repeat;
+	background: url(images/buttons.png) 0 -1255px no-repeat;
 	cursor: pointer;
 }
 
 .dropbutton .dropbuttontip:hover {
-	background-position: 0 -1255px;
+	background-position: -26px -1255px;
 }
 
 .toolbar a.button.back {
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index c1bbfada8..08cce32ce 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -61,7 +61,6 @@ function rcube_mail_ui()
     if (rcmail.env.task == 'mail') {
       rcmail.addEventListener('menu-open', show_listoptions);
       rcmail.addEventListener('menu-save', save_listoptions);
-      rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 100); });
 
       var dragmenu = $('#dragmessagemenu');
       if (dragmenu.length) {
@@ -76,8 +75,10 @@ function rcube_mail_ui()
 
       if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
         layout_messageview();
+        $("#all-headers").resizable({ handles: 's', minHeight: 50 });
       }
       else if (rcmail.env.action == 'compose') {
+        rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 100); });
         rcmail.addEventListener('aftersend-attachment', show_uploadform);
         layout_composeview();