1 files changed, 42 insertions, 37 deletions

diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 04f56e134..0ee43aef1 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -38,6 +38,10 @@
 	bottom: 28px;
 }
 
+#mailview-top.fullheight {
+	border-radius: 4px 4px 0 0;
+}
+
 #mailview-bottom {
 	position: absolute;
 	left: 0;
@@ -46,10 +50,6 @@
 	height: 26px;
 }
 
-#mailview-top.fullheight {
-	border-radius: 4px 4px 0 0;
-}
-
 #folderlist-header {
 	width: 100%;
 	height: 12px;
@@ -675,14 +675,15 @@ a.iconbutton.threadmode.selected {
 
 #messagecontent {
 	position: absolute;
-	top: 0;
+	top: 140px;
 	left: 0;
 	width: 100%;
-	bottom: 28px;
+	bottom: 0;
 	overflow: auto;
 	border-radius: 4px 4px 0 0;
 }
 
+#messageheader,
 #partheader,
 #composeheaders {
 	position: relative;
@@ -706,7 +707,7 @@ h2.subject {
 
 h3.subject {
 	font-size: 14px;
-	margin: 0 13em 0 0;
+	margin: 0 8em 0 0;
 	padding: 8px 8px 4px 8px;
 	white-space: nowrap;
 	overflow: hidden;
@@ -781,7 +782,6 @@ h3.subject {
 	background: -ms-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
 	background: linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
 	border-right: 1px solid #dfdfdf;
-	border-radius: 3px 0 0 0; /* for Opera */
 }
 
 #previewheaderstoggle .iconlink {
@@ -796,29 +796,28 @@ h3.subject {
 
 #previewheaderstoggle.remove .iconlink {
 	top: auto;
-	bottom: 15px;
+	bottom: 5px;
 	background-position: -5px -242px;
 }
 
-#previewheaderstoggle .iconlink.allheaders {
-	display: none;
+div.more-headers {
+	cursor: pointer;
+	height: 10px;
+	background: url(images/buttons.png) center -1619px no-repeat;
 }
 
-#previewheaderstoggle.remove .iconlink.allheaders {
-	top: auto;
-	bottom: 2px;
-	display: inline-block;
-	background-position: -27px -242px;
+div.hide-headers {
+	background-position: center -1629px;
 }
 
 #all-headers {
 	position: relative;
-	margin: 2px 0;
+	margin: 0 10px;
 	padding: 0;
 	height: 180px;
-	background-color: #f0f0f0;
-	overflow: hidden;
+	border: 1px solid #bbb;
 	border-radius: 4px;
+	background: #fff;
 }
 
 #headers-source {
@@ -828,31 +827,26 @@ h3.subject {
 	left: 0;
 	right: 0;
 	bottom: 0;
-	padding: 2px;
+	padding: 2px 5px;
 	overflow: auto;
 	text-align: left;
-	color: #666;
+	color: #333;
 }
 
-#messageheader {
+#messagepreviewheader {
 	position: relative;
 	height: auto;
 	min-height: 52px;
 	margin: 0 8px 0 0;
-	padding: 0 0 0 72px;
+	padding: 0 0 6px 72px;
 	border-bottom: 2px solid #f0f0f0;
 }
 
-#messagecontent #messageheader {
-	padding: 0 0 0 90px;
-	min-height: 68px;
-}
-
-#messageheader h3.subject {
+#messagepreviewheader h3.subject {
 	padding: 8px 8px 2px 0;
 }
 
-#messageheader #contactphoto {
+#messagepreviewheader #contactphoto {
 	display: block;
 	position: absolute;
 	top: 11px;
@@ -864,35 +858,46 @@ h3.subject {
 	border-radius: 3px;
 }
 
-#messageheader #contactphoto img {
+#messagepreviewheader #contactphoto img {
 	width: 32px;
 	height: auto;
 	border-radius: 3px;
 }
 
-#messagecontent #messageheader #contactphoto {
-	top: 11px;
-	left: 31px;
+#messageheader #contactphoto {
+	display: block;
+	position: absolute;
+	top: 40px;
+	right: 10px;
 	width: 48px;
 	height: 48px;
-	background: url(images/contactpic_48px.png) center center no-repeat #fff;
+	overflow: hidden;
 	border-radius: 4px;
 }
 
-#messagecontent #messageheader #contactphoto img {
+#messageheader #contactphoto img {
 	width: 48px;
 	height: auto;
 	border-radius: 4px;
 }
 
+#messagepreviewheader #countcontrols,
 #messageheader #countcontrols {
 	position: absolute;
 	top: 8px;
-	right: 0;
+	right: 8px;
+	width: 20em;
 	text-align: right;
 	white-space: nowrap;
 }
 
+#messageheader .pagenav .countdisplay {
+	min-width: 0;
+	padding-right: 0.5em;
+	white-space: nowrap;
+}
+
+#messagecontent .leftcol,
 #messagepreview .leftcol {
 	margin-right: 252px;
 	overflow-x: auto;