1 files changed, 22 insertions, 40 deletions

diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 98836bba2..b82fb790e 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -38,6 +38,9 @@
 	left: 0;
 	right: 0;
 	bottom: 0px;
+}
+
+html.ie #mailview-top {
 	overflow: visible; /* fixes display issues of fixed list header in IE */
 }
 
@@ -92,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 {
@@ -312,11 +316,11 @@ 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 > a:focus,
 #mailboxlist li.mailbox ul li.selected > a {
-	background-position: 22px -117px;
+	background-position: 22px -119px;
 }
 #mailboxlist li.mailbox ul li div.treetoggle {
 	left: 33px;
@@ -325,11 +329,11 @@ 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 > a:focus,
 #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;
@@ -337,11 +341,11 @@ 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 > a:focus,
 #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;
@@ -349,11 +353,11 @@ 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 > a:focus,
 #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;
@@ -372,6 +376,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%);
@@ -796,7 +801,7 @@ table.messagelist.fixedcopy {
 
 #messagecontframe {
 	border: 0;
-	border-radius: 4px 4px 0 0;
+	border-radius: 4px;
 }
 
 #messagecontent {
@@ -1145,16 +1150,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 {
@@ -1166,8 +1166,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 {
@@ -1316,23 +1318,6 @@ div.message-partheaders .headers-table td.header {
 	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;
 }
@@ -1638,16 +1623,13 @@ div.message-partheaders .headers-table td.header {
 	padding-bottom: 8px;
 }
 
-.defaultSkin table.mceLayout,
-.defaultSkin table.mceLayout tr.mceLast td {
-	border: 0 !important;
-}
-
-.defaultSkin td.mceToolbar {
+#composebodycontainer .mce-tinymce {
 	border: 0 !important;
+	margin-top: 1px;
 }
 
-.defaultSkin table.mceLayout tr.mceFirst td {
+#composebodycontainer .mce-panel {
+	border-color: #ccc !important;
 	background: #f0f0f0;
 }