1 files changed, 37 insertions, 19 deletions

diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 8297fde49..e5c0ae045 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -676,10 +676,10 @@ a.iconbutton.threadmode.selected {
 
 #messagecontent {
 	position: absolute;
-	top: 140px;
+	top: 110px;
 	left: 0;
 	width: 100%;
-	bottom: 0;
+	bottom: 27px;
 	overflow: auto;
 	border-radius: 4px 4px 0 0;
 }
@@ -690,16 +690,20 @@ a.iconbutton.threadmode.selected {
 	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;
-	border-bottom: 2px solid #e6e6e6;
+	padding-left: 26px;
+	/* avoid headers eating up all the vertical space */
+	max-height: 50%;
+	overflow: auto;
 }
 
 h2.subject {
@@ -725,16 +729,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;
 }
 
@@ -744,10 +755,17 @@ 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 {
 	position: relative;
 	top: 1px;
@@ -788,6 +806,7 @@ 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 {
@@ -847,23 +866,21 @@ div.hide-headers {
 	color: #333;
 }
 
-#messagepreviewheader #all-headers {
+#messageheader.previewheader #all-headers {
 	margin-left: 0;
 }
 
-#messagepreviewheader {
+#messageheader.previewheader {
 	position: relative;
 	height: auto;
-	margin: 0 8px 0 0;
-	padding: 0 0 6px 26px;
-	border-bottom: 2px solid #f0f0f0;
+	min-height: 52px;
+	padding: 0 0 3px 26px;
 }
 
-#messagepreviewheader h3.subject {
+#messageheader.previewheader h3.subject {
 	padding: 8px 8px 2px 0;
 }
 
-#messagepreviewheader #countcontrols,
 #messageheader #countcontrols {
 	position: absolute;
 	top: 8px;
@@ -1097,6 +1114,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 {