1 files changed, 52 insertions, 43 deletions

diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index ca29c79b4..e258cad88 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -34,12 +34,16 @@
 
 #mailview-top {
 	position: absolute;
-	top: 42px;
+	top: 0;
 	left: 0;
 	right: 0;
 	bottom: 0px;
 }
 
+html.ie #mailview-top {
+	overflow: visible; /* fixes display issues of fixed list header in IE */
+}
+
 #mailview-bottom {
 	display: none;
 	position: absolute;
@@ -58,7 +62,7 @@
 #mailboxcontainer,
 #messagelistcontainer {
 	position: absolute;
-	top: 42px;
+	top: 0;
 	left: 0;
 	width: 100%;
 	bottom: 0;
@@ -91,6 +95,7 @@ html>/**/body #messagelist {
 	background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
 	background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
 	border-radius: 0 0 4px 4px;
+	white-space: nowrap;
 }
 
 #messagelistfooter.rightalign {
@@ -201,6 +206,14 @@ a.iconbutton.threadmode.selected {
 	background-position: 6px -406px;
 }
 
+#mailboxlist li.mailbox.trash.empty > a {
+	background-position: 6px -1924px;
+}
+
+#mailboxlist li.mailbox.trash.empty.selected > a {
+	background-position: 6px -1948px;
+}
+
 #mailboxlist li.mailbox.archive > a {
 	background-position: 6px -1699px;
 }
@@ -241,6 +254,14 @@ a.iconbutton.threadmode.selected {
 	background-position: 23px -406px;
 }
 
+#mailboxlist li.mailbox ul li.trash.empty > a {
+	background-position: 23px -1924px;
+}
+
+#mailboxlist li.mailbox ul li.trash.empty.selected > a {
+	background-position: 23px -1948px;
+}
+
 #mailboxlist li.mailbox ul li.archive > a {
 	background-position: 23px -1699px;
 }
@@ -281,10 +302,10 @@ a.iconbutton.threadmode.selected {
 
 #mailboxlist li.mailbox ul li a {
 	padding-left: 52px;  /* 36 + 1 x 16 */
-	background-position: 22px -93px;  /* 6 + 1 x 16 */
+	background-position: 22px -95px;  /* 6 + 1 x 16 */
 }
 #mailboxlist li.mailbox ul li.selected > a {
-	background-position: 22px -117px;
+	background-position: 22px -119px;
 }
 #mailboxlist li.mailbox ul li div.treetoggle {
 	left: 33px;
@@ -293,10 +314,10 @@ a.iconbutton.threadmode.selected {
 
 #mailboxlist li.mailbox ul ul li.mailbox a {
 	padding-left: 68px;  /* 2x */
-	background-position: 38px -93px;
+	background-position: 38px -95px;
 }
 #mailboxlist li.mailbox ul ul li.selected > a {
-	background-position: 38px -117px;
+	background-position: 38px -119px;
 }
 #mailboxlist li.mailbox ul ul li div.treetoggle {
 	left: 48px;
@@ -304,10 +325,10 @@ a.iconbutton.threadmode.selected {
 
 #mailboxlist li.mailbox ul ul ul li.mailbox a {
 	padding-left: 84px;  /* 3x */
-	background-position: 54px -93px;
+	background-position: 54px -95px;
 }
 #mailboxlist li.mailbox ul ul ul li.selected > a {
-	background-position: 54px -117px;
+	background-position: 54px -119px;
 }
 #mailboxlist li.mailbox ul ul ul li div.treetoggle {
 	left: 64px;
@@ -315,10 +336,10 @@ a.iconbutton.threadmode.selected {
 
 #mailboxlist li.mailbox ul ul ul ul li.mailbox a {
 	padding-left: 100px;  /* 4x */
-	background-position: 70px -93px;
+	background-position: 70px -95px;
 }
 #mailboxlist li.mailbox ul ul ul ul li.selected > a {
-	background-position: 70px -117px;
+	background-position: 70px -119px;
 }
 #mailboxlist li.mailbox ul ul ul ul li div.treetoggle {
 	left: 80px;
@@ -337,6 +358,7 @@ a.iconbutton.threadmode.selected {
 	top: 3px;
 	right: 6px;
 	min-width: 1.8em;
+	line-height: 15px;
 	padding: 2px 4px;
 	background: #82acb5;
 	background: -moz-linear-gradient(top, #82acb5 0%, #6a939f 100%);
@@ -497,6 +519,14 @@ table.messagelist.fixedcopy {
 	width: 155px;
 }
 
+.messagelist tr td.folder {
+	width: 135px;
+}
+
+.messagelist tr td.hidden {
+	display: none;
+}
+
 .messagelist tr.message {
 /*	background-color: #fff; */
 }
@@ -738,7 +768,7 @@ table.messagelist.fixedcopy {
 
 #messagecontframe {
 	border: 0;
-	border-radius: 4px 4px 0 0;
+	border-radius: 4px;
 }
 
 #messagecontent {
@@ -1049,20 +1079,20 @@ div.hide-headers {
 	margin: 8px;
 }
 
-#message-objects div.notice,
-#message-buttons div.notice {
+#message-objects div.notice {
 	display: block;
 	color: #960;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
 	background-position: 5px -83px;
-	padding: 6px 12px 4px 30px;
+	padding: 6px 12px 6px 30px;
 	white-space: normal;
 }
 
 #message-objects div a.button,
 #messagebody span.part-notice a.button {
 	margin-left: 10px;
+	margin-top: -1px;
 }
 
 div.message-part,
@@ -1077,16 +1107,11 @@ div.message-partheaders {
 	border-top: 0;
 }
 
-div.message-part pre,
-div.message-htmlpart pre,
 div.message-part div.pre {
 	margin: 0;
 	padding: 0;
 	font-family: monospace;
 	font-size: 12px;
-	white-space: -moz-pre-wrap !important;
-	white-space: pre-wrap !important;
-	white-space: pre;
 }
 
 div.message-part span.sig {
@@ -1098,8 +1123,10 @@ div.message-part blockquote {
 	border-left: 2px solid blue;
 	border-right: 2px solid blue;
 	background-color: #F6F6F6;
-	margin: 2px 0 2px 0;
-	padding: 1px 8px 1px 10px;
+	margin: 2px 0;
+	padding: 0 0.4em;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 div.message-part blockquote blockquote {
@@ -1186,7 +1213,7 @@ div.message-partheaders .headers-table td.header {
 
 #messagepartcontainer {
 	position: absolute;
-	top: 42px;
+	top: 0;
 	left: 232px;
 	right: 0;
 	bottom: 0;
@@ -1200,7 +1227,7 @@ div.message-partheaders .headers-table td.header {
 
 #messagepartheader {
 	position: absolute;
-	top: 42px;
+	top: 0;
 	left: 0;
 	width: 220px;
 	bottom: 0;
@@ -1242,29 +1269,12 @@ div.message-partheaders .headers-table td.header {
 
 #compose-contacts {
 	position: absolute;
-	top: 42px;
+	top: 0;
 	left: 0;
 	width: 100%;
 	bottom: 0;
 }
 
-#composequicksearch {
-	position: relative;
-	padding: 4px;
-	background: #c7e3ef;
-}
-
-#composequicksearch .searchbox input {
-	width: 100%;
-	height: 26px;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
-
-#composequicksearch #searchmenulink {
-	width: 15px;
-}
-
 #compose-contacts #directorylist {
 	border-bottom: 4px solid #c7e3ef;
 }
@@ -1345,7 +1355,7 @@ div.message-partheaders .headers-table td.header {
 
 #compose-content {
 	position: absolute;
-	top: 42px;
+	top: 0;
 	left: 0;
 	right: 0;
 	bottom: 0px;
@@ -1435,7 +1445,6 @@ div.message-partheaders .headers-table td.header {
 	-o-box-shadow: inset 0 1px 0 0 #fff;
 	-webkit-box-shadow: inset 0 1px 0 0 #fff;
 	-moz-box-shadow: inset 0 1px 0 0 #fff;
-
 }
 
 .composeoption {