5 files changed, 48 insertions, 29 deletions
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index 54bee0156..9f8f44536 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 0af34f371..f63083e68 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -712,7 +712,6 @@ a.iconbutton.threadmode.selected {
 }
 
 #messageheader,
-#partheader,
 #composeheaders {
 	position: relative;
 	padding: 3px 0;
@@ -1147,8 +1146,8 @@ div.message-partheaders .headers-table td.header {
 
 #messagepartcontainer {
 	position: absolute;
-	top: 60px;
-	left: 0;
+	top: 42px;
+	left: 232px;
 	right: 0;
 	bottom: 0;
 }
@@ -1159,6 +1158,28 @@ div.message-partheaders .headers-table td.header {
 	height: 100%;
 }
 
+#messagepartheader {
+	position: absolute;
+	top: 42px;
+	left: 0;
+	width: 220px;
+	bottom: 0;
+}
+
+#messagepartheader table {
+	table-layout: fixed;
+	overflow: hidden;
+}
+
+#messagepartheader table td {
+	text-overflow: ellipsis;
+}
+
+#messagepartheader table td.title {
+	width: 60px;
+}
+
+
 /*** message composition ***/
 
 #composeview-left {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 4d689ab2f..ec4f3047c 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -690,17 +690,6 @@ a.iconlink.upload {
 	opacity: 0.999;
 }
 
-.partwin #topline {
-	position: absolute;
-	right: 6px;
-	top: 18px;
-	width: auto;
-	z-index: 100;
-	background: transparent;
-	background: none;
-	border: 0;
-}
-
 .minimal #topline a.button-logout {
 	display: none;
 }
@@ -883,10 +872,6 @@ a.iconlink.upload {
 	top: 102px;
 }
 
-.partwin #mainscreen {
-	top: 60px
-}
-
 .extwin #mainscreen {
 	top: 40px;
 }
@@ -1817,6 +1802,10 @@ ul.proplist li {
 	background-position: 0 -1745px;
 }
 
+.toolbar a.button.download {
+	background-position: center -1906px;
+}
+
 a.menuselector {
 	display: inline-block;
 	border: 1px solid #ababab;
diff --git a/skins/larry/templates/messagepart.html b/skins/larry/templates/messagepart.html
index dbb4940de..a60210cb8 100644
--- a/skins/larry/templates/messagepart.html
+++ b/skins/larry/templates/messagepart.html
@@ -4,33 +4,38 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="partwin">
+<body class="extwin noscroll">
 
-<div id="header">
 <div id="topline">
 	<div class="topright">
 		<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
 	</div>
 </div>
 
-<div id="topnav">
-	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" />
-</div>
+<div id="mainscreen">
 
-<br style="clear:both" />
+<div id="messagetoolbar" class="toolbar fullwidth">
+	<roundcube:button command="download" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" />
+	<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" />
 </div>
 
-<div id="mainscreen">
-
-<div id="partheader" class="uibox">
-<roundcube:object name="messagePartControls" class="headers-table" />
+<div id="messagepartheader" class="uibox listbox">
+	<h2 class="boxtitle"><roundcube:label name="properties" /></h2>
+	<div class="scroller">
+		<roundcube:object name="messagePartControls" class="listing" />
+	</div>
 </div>
 
 <div id="messagepartcontainer" class="uibox">
-<roundcube:object name="messagePartFrame" id="messagepartframe" frameborder="0" />
+	<div class="iframebox">
+	<roundcube:object name="messagePartFrame" id="messagepartframe" frameborder="0" />
+	</div>
+	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
 
+<roundcube:include file="/includes/footer.html" />
+
 </body>
 </html>
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index a8572720b..7dc9b57b1 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -154,6 +154,10 @@ function rcube_mail_ui()
         rcmail.addEventListener('enable-command', enable_command);
         rcmail.addEventListener('afterimport-messages', show_uploadform);
       }
+      else if (rcmail.env.action == 'get') {
+        new rcube_splitter({ id:'mailpartsplitterv', p1:'#messagepartheader', p2:'#messagepartcontainer',
+          orientation:'v', relative:true, start:226, min:150, size:12}).init();
+      }
 
       if ($('#mailview-left').length) {
         new rcube_splitter({ id:'mailviewsplitterv', p1:'#mailview-left', p2:'#mailview-right',