3 files changed, 47 insertions, 3 deletions
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 25bcc0b64..4be475bac 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -6,6 +6,7 @@
 		<a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link" id="supportlink"><roundcube:label name="support" /></a>
 		<roundcube:endif />
 	</div>
+
 	<div class="topright">
 	<roundcube:if condition="!env:extwin" />
 		<span class="username"><roundcube:object name="username" /></span>
@@ -14,6 +15,8 @@
 		<roundcube:button command="close" label="close" class="closelink" />
 	<roundcube:endif />
 	</div>
+
+	<roundcube:container name="topline" id="topline" />
 </div>
 
 <roundcube:if condition="!env:extwin" />
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 20a13f62f..48560abe2 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -1050,10 +1050,51 @@ div.message-part blockquote blockquote blockquote {
 	border-bottom: 2px solid #f0f0f0;
 }
 
-#messagebody > p > img {
+#messagebody fieldset.image-attachment {
+	border: 0;
+	border-top: 1px solid #ccc;
+	margin-top: 1em;
+}
+
+#messagebody fieldset.image-attachment p > img {
 	max-width: 80%;
 }
 
+#messagebody legend.image-filename {
+	color: #999;
+	font-size: 0.9em;
+	margin: 0 1em;
+}
+
+#messagebody p.image-attachment {
+	position: relative;
+	padding: 1em;
+	border-top: 1px solid #ccc;
+}
+
+#messagebody p.image-attachment a.image-link {
+	float: left;
+	display: block;
+	margin-right: 2em;
+	min-width: 160px;
+	min-height: 60px;
+	text-align: center;
+}
+
+#messagebody p.image-attachment .image-filename {
+	display: block;
+	font-weight: bold;
+	line-height: 1.6em;
+}
+
+#messagebody p.image-attachment .image-filesize {
+	padding-right: 1em;
+}
+
+#messagebody p.image-attachment .attachment-links a {
+	margin-right: 0.6em;
+}
+
 #messagepartcontainer {
 	position: absolute;
 	top: 60px;
@@ -1293,7 +1334,7 @@ div.message-part blockquote blockquote blockquote {
 
 #composebody {
 	position: absolute;
-	top: 1px;
+	top: 0;
 	left: 0;
 	bottom: 0;
 	width: 99%;
diff --git a/skins/larry/templates/messagepart.html b/skins/larry/templates/messagepart.html
index db078296f..e029973a8 100644
--- a/skins/larry/templates/messagepart.html
+++ b/skins/larry/templates/messagepart.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="extwin">
+<body class="partwin">
 
 <div id="header">
 <div id="topline">