1 files changed, 99 insertions, 48 deletions
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 04f56e134..a2756638d 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,24 +675,33 @@ a.iconbutton.threadmode.selected {
 
 #messagecontent {
 	position: absolute;
-	top: 0;
+	top: 110px;
 	left: 0;
 	width: 100%;
-	bottom: 28px;
+	bottom: 27px;
 	overflow: auto;
-	border-radius: 4px 4px 0 0;
 }
 
+#messageheader,
 #partheader,
 #composeheaders {
 	position: relative;
 	padding: 3px 0;
 	background: #f9f9f9;
-	background: -moz-linear-gradient(top, #fff 0%, #e9e9e9 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#e9e9e9));
-	background: -o-linear-gradient(top, #fff 0%, #e9e9e9 100%);
-	background: -ms-linear-gradient(top, #fff 0%, #e9e9e9 100%);
-	background: linear-gradient(top, #fff 0%, #e9e9e9 100%);
+	background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#f0f0f0));
+	background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	background: linear-gradient(top, #fff 0%, #f0f0f0 100%);
+	border-bottom: 1px solid #dfdfdf;
+}
+
+#mailview-right #messageheader {
+	border-radius: 4px 4px 0 0;
+	padding-left: 78px;
+	/* avoid headers eating up all the vertical space */
+	max-height: 50%;
+	overflow: auto;
 }
 
 h2.subject {
@@ -704,9 +713,13 @@ h2.subject {
 	text-overflow: ellipsis;
 }
 
+#mailview-right #messageheader h2.subject {
+	margin-left: -56px;
+}
+
 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;
@@ -718,16 +731,23 @@ h3.subject {
 	padding: 2px 8px;
 }
 
-.headers-table td.header {
+.headers-table td.header,
+.ui-dialog-content.popup span.adr {
 	font-weight: bold;
 }
 
-.headers-table td.header a {
+.headers-table td.header-title {
+	white-space: nowrap;
+}
+
+.headers-table td.header a,
+.ui-dialog-content.popup span.adr a {
 	color: #666;
 	text-decoration: none;
 }
 
-.headers-table td.header a:hover {
+.headers-table td.header a:hover,
+.ui-dialog-content.popup span.adr a:hover {
 	text-decoration: underline;
 }
 
@@ -737,8 +757,15 @@ h3.subject {
 	font-weight: bold;
 }
 
-.headers-table td.header span {
+.headers-table td.header span,
+.ui-dialog-content.popup span.adr {
+	white-space: nowrap;
+}
+
+.headers-table td.header a.morelink {
+	color: #0069a6;
 	white-space: nowrap;
+	font-weight: normal;
 }
 
 .rcmaddcontact {
@@ -796,29 +823,40 @@ h3.subject {
 
 #previewheaderstoggle.remove .iconlink {
 	top: auto;
-	bottom: 15px;
+	bottom: 5px;
 	background-position: -5px -242px;
 }
 
-#previewheaderstoggle .iconlink.allheaders {
-	display: none;
+#full-headers {
+	position: relative;
 }
 
-#previewheaderstoggle.remove .iconlink.allheaders {
-	top: auto;
-	bottom: 2px;
-	display: inline-block;
-	background-position: -27px -242px;
+div.more-headers {
+	position: absolute;
+	top: -12px;
+	right: 10px;
+	width: 12px;
+	height: 10px;
+	cursor: pointer;
+	background: url(images/buttons.png) center -1619px no-repeat;
+}
+
+div.hide-headers {
+	background-position: center -1629px;
 }
 
 #all-headers {
 	position: relative;
-	margin: 2px 0;
+	margin: 4px 10px;
 	padding: 0;
 	height: 180px;
-	background-color: #f0f0f0;
-	overflow: hidden;
+	border: 1px solid #ccc;
 	border-radius: 4px;
+	background: #fdfdfd;
+	-moz-box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
+	-webkit-box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
+	-o-box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
+	box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
 }
 
 #headers-source {
@@ -828,31 +866,28 @@ h3.subject {
 	left: 0;
 	right: 0;
 	bottom: 0;
-	padding: 2px;
+	padding: 3px 6px;
 	overflow: auto;
 	text-align: left;
-	color: #666;
+	color: #333;
+}
+
+#messageheader.previewheader #all-headers {
+	margin-left: 0;
 }
 
-#messageheader {
+#messageheader.previewheader {
 	position: relative;
 	height: auto;
 	min-height: 52px;
-	margin: 0 8px 0 0;
-	padding: 0 0 0 72px;
-	border-bottom: 2px solid #f0f0f0;
-}
-
-#messagecontent #messageheader {
-	padding: 0 0 0 90px;
-	min-height: 68px;
+	padding: 0 0 3px 72px;
 }
 
-#messageheader h3.subject {
+#messageheader.previewheader h3.subject {
 	padding: 8px 8px 2px 0;
 }
 
-#messageheader #contactphoto {
+#messageheader.previewheader #contactphoto {
 	display: block;
 	position: absolute;
 	top: 11px;
@@ -864,22 +899,26 @@ h3.subject {
 	border-radius: 3px;
 }
 
-#messageheader #contactphoto img {
+#messageheader.previewheader #contactphoto img {
 	width: 32px;
 	height: auto;
 	border-radius: 3px;
 }
 
-#messagecontent #messageheader #contactphoto {
-	top: 11px;
-	left: 31px;
+#messageheader #contactphoto {
+	display: block;
+	position: absolute;
+	top: 34px;
+	left: 30px;
 	width: 48px;
 	height: 48px;
-	background: url(images/contactpic_48px.png) center center no-repeat #fff;
+	overflow: hidden;
 	border-radius: 4px;
+	border: 1px solid #e6e6e6;
+	background: url(images/contactpic_48px.png) center center no-repeat #fff;
 }
 
-#messagecontent #messageheader #contactphoto img {
+#messageheader #contactphoto img {
 	width: 48px;
 	height: auto;
 	border-radius: 4px;
@@ -888,16 +927,25 @@ h3.subject {
 #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;
 }
 
+#messagecontent .rightcol,
 #messagepreview .rightcol {
 	float: right;
 /*
@@ -1110,6 +1158,7 @@ div.message-part blockquote blockquote blockquote {
 	-webkit-box-shadow: 0 2px 3px 0 #999;
 	-moz-box-shadow: 0 2px 3px 0 #999;
 	box-shadow: 0 2px 3px 0 #999;
+	border-bottom: 0;
 }
 
 #composebuttons {
@@ -1168,6 +1217,8 @@ div.message-part blockquote blockquote blockquote {
 .compose-headers td input {
 	width: 100%;
 	resize: none;
+	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
 }
 
 #compose-cc, #compose-bcc, #compose-replyto, #compose-followupto {