--- a/skins/classic/mail.css	Sat Dec 29 06:32:49 2018 -0500
+++ b/skins/classic/mail.css	Sat Dec 29 07:07:34 2018 -0500
@@ -36,7 +36,7 @@
   padding: 0;
   margin: 0 5px;
   overflow: hidden;
-  background: url(images/mail_toolbar.png?v=6409.13340) 0 0 no-repeat transparent;
+  background: url(images/mail_toolbar.png?v=2271.13035) 0 0 no-repeat transparent;
   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
 }
 
@@ -184,6 +184,14 @@
   background-position: -548px 0;
 }
 
+#messagetoolbar a.encrypt {
+  background-position: -612px 0;
+}
+
+#messagetoolbar a.encryptSel {
+  background-position: -612px -32px;
+}
+
 #messagemenu li a.active:hover,
 #attachmentmenu li a.active:hover,
 #markmessagemenu li a.active:hover
@@ -195,7 +203,7 @@
 #messagemenu li a,
 #attachmentmenu li a
 {
-  background: url(images/messageactions.png?v=d93e.3223) no-repeat 7px 0;
+  background: url(images/messageactions.png?v=8c64.2615) no-repeat 7px 0;
   background-position: 7px 20px;
 }
 
@@ -210,9 +218,14 @@
   background-position: 7px -17px;
 }
 
+#attachmentmenu li a.renamelink
+{
+  background-position: 6px -69px;
+}
+
 #messagemenu li a.sourcelink
 {
-  background-position: 7px -35px;
+  background-position: 7px -34px;
 }
 
 #messagemenu li a.openlink,
@@ -228,18 +241,19 @@
 
 #messagemenu li a.movelink
 {
-  background-position: 6px -161px;
+  background-position: 6px -160px;
 }
 
 #messagemenu li a.copylink
 {
-  background-position: 6px -143px;
+  background-position: 6px -142px;
 }
 
 #markmessagemenu li a,
-#compose-attachments li a
+#compose-attachments li a.delete,
+#compose-attachments li a.cancelupload
 {
-  background: url(images/messageicons.png?v=16cb.2581) no-repeat;
+  background: url(images/messageicons.png?v=c493.2511) no-repeat;
 }
 
 #markmessagemenu li a.readlink
@@ -354,11 +368,12 @@
 #mailpreviewframe
 {
   position: absolute;
-  width: 100%;
+  right: 0;
   top: 205px;
   bottom: 0px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
+  display: none;
 }
 
 #messagecontframe
@@ -453,7 +468,7 @@
   margin-top: 4px;
   margin-right: 2px;
   overflow: hidden;
-  background: url(images/mail_footer.png?v=819f.977) 0 0 no-repeat transparent;
+  background: url(images/mail_footer.png?v=1c4b.774) 0 0 no-repeat transparent;
   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
 }
 
@@ -533,6 +548,7 @@
   right: 4px;
   white-space: nowrap;
   font-size: 11px;
+  line-height: 14px;
 }
 
 #countcontrols a.button,
@@ -555,7 +571,6 @@
   width: 100%;
   display: table;
   table-layout: fixed;
-  border-collapse: collapse;
   border-spacing: 0;
   z-index: 1;
 }
@@ -653,10 +668,10 @@
   cursor: pointer;
 }
 
-.messagelist tr > .flag span,
-.messagelist tr > .status span,
-.messagelist tr > .attachment span,
-.messagelist tr > .priority span
+.messagelist tr .flag span,
+.messagelist tr .status span,
+.messagelist tr .attachment span,
+.messagelist tr .priority span
 {
   display: block;
   width: 15px;
@@ -667,17 +682,18 @@
 .messagelist tr td div.collapsed,
 .messagelist tr td div.expanded,
 .messagelist tr > .threads .listmenu,
-.messagelist tr > .attachment span.attachment,
-.messagelist tr > .attachment span.report,
+.messagelist tr .attachment span.attachment,
+.messagelist tr .attachment span.report,
+.messagelist tr .attachment span.encrypted,
 .messagelist tr > .priority span.priority,
 .messagelist tr > .priority span.prio1,
 .messagelist tr > .priority span.prio2,
 .messagelist tr > .priority span.prio3,
 .messagelist tr > .priority span.prio4,
 .messagelist tr > .priority span.prio5,
-.messagelist tr > .flag span.flagged,
-.messagelist tr > .flag span.unflagged,
-.messagelist tr > .flag span.unflagged:hover,
+.messagelist tr .flag span.flagged,
+.messagelist tr .flag span.unflagged,
+.messagelist tr:hover .flag span.unflagged,
 .messagelist tr > .status span.status,
 .messagelist tr > .status span.msgicon,
 .messagelist tr > .status span.deleted,
@@ -694,19 +710,24 @@
   vertical-align: middle;
   height: 17px;
   width: 15px;
-  background: url(images/messageicons.png?v=16cb.2581) center no-repeat;
+  background: url(images/messageicons.png?v=c493.2511) center no-repeat;
 }
 
-.messagelist tr > .attachment span.attachment
+.messagelist tr .attachment span.attachment
 {
   background-position: 0 -170px;
 }
 
-.messagelist tr > .attachment span.report
+.messagelist tr .attachment span.report
 {
   background-position: 0 -255px;
 }
 
+.messagelist tr .attachment span.encrypted
+{
+  background-position: 0 -418px;
+}
+
 .messagelist tr > .priority span.priority
 {
   background-position: 0 -309px;
@@ -737,12 +758,18 @@
   background-position: 0 -290px;
 }
 
-.messagelist tr > .flag span.flagged
+.messagelist tr .flag span.flagged
 {
   background-position: 0 -153px;
 }
 
-.messagelist tr > .flag span.unflagged:hover
+.messagelist tr:hover .flag span.unflagged
+{
+  background-position: 0 -136px;
+}
+
+.messagelist tr.flaggedroot .flag span,
+.messagelist tr.flaggedroot .flag span.unflagged
 {
   background-position: 0 -136px;
 }
@@ -770,10 +797,10 @@
 }
 
 .messagelist tr > .status span.msgicon,
-.messagelist tr > .flag span.unflagged,
+.messagelist tr .flag span.unflagged,
 .messagelist tr > .status span.unreadchildren
 {
-  background-position: 0 17px; /* no icon */
+  background-position: 0 18px; /* no icon */
 }
 
 .messagelist tr > .status span.msgicon:hover
@@ -902,7 +929,7 @@
 
 /* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
 .messagelist tbody tr.focused > td:first-child {
-	border-left: 4px solid #d4d4d4;
+	border-left: 2px solid #d4d4d4;
 	padding-left: 4px;
 }
 
@@ -1029,6 +1056,10 @@
   background-color: #F4F4F4;
 }
 
+#messagebody.mailvelope {
+  padding: 10px 8px;
+}
+
 #messagebody table.headers-table
 {
   margin: 16px 6px 6px 6px;
@@ -1078,7 +1109,7 @@
   min-height: 16px;
   list-style-image: none;
   list-style-type: none;
-  background: url(images/icons/attachment.png?v=08f7.518) 4px 2px no-repeat #DFDFDF;
+  background: url(images/icons/attachment.png?v=ee4e.516) 4px 2px no-repeat #DFDFDF;
 }
 
 #messageframe #attachment-list
@@ -1123,11 +1154,12 @@
 #attachment-list li a.drop {
   background: url(images/icons/down_small.gif?v=f368.105) no-repeat center 6px;
   width: 12px;
-  height: 7px;
+  height: 16px;
   cursor: pointer;
-  padding: 5px 0 0;
+  padding: 0;
   margin-left: 3px;
   display: inline-block;
+  vertical-align: middle;
 }
 
 #messagebody
@@ -1523,10 +1555,11 @@
 
 #compose-attachments ul li
 {
+  position: relative;
   height: 18px;
   line-height: 16px;
   font-size: 11px;
-  padding: 2px 2px 1px 2px;
+  padding: 2px 16px 1px 2px;
   border-bottom: 1px solid #EBEBEB;
   white-space: nowrap;
   overflow: hidden;
@@ -1534,7 +1567,8 @@
   -o-text-overflow: ellipsis;
 }
 
-#compose-attachments li a
+#compose-attachments li a.delete,
+#compose-attachments li a.cancelupload
 {
   text-indent: -5000px;
   width: 17px;
@@ -1543,6 +1577,7 @@
   display: inline-block;
   text-decoration: none;
   vertical-align: middle;
+  background-position: 0px -392px;
 }
 
 #compose-attachments li img
@@ -1550,18 +1585,23 @@
   vertical-align: middle;
 }
 
-#compose-attachments li a.delete,
-#compose-attachments li a.cancelupload
-{
-  background-position: 0px -392px;
-}
-
 #compose-attachments li span
 {
   line-height: 18px;
   vertical-align: middle;
 }
 
+#compose-attachments li a.drop {
+  background: url(images/icons/down_small.gif?v=f368.105) no-repeat center 8px;
+  width: 16px;
+  height: 22px;
+  cursor: pointer;
+  display: block;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
 #upload-form,
 #attachment-form
 {
@@ -1610,7 +1650,7 @@
 {
   display: block;
   font-size: 11px;
-  background: url(images/icons/folders.png?v=d9d2.5356) 5px -108px no-repeat;
+  background: url(images/icons/folders.png?v=7c4f.5218) 5px -108px no-repeat;
   border-bottom: 1px solid #EBEBEB;
   white-space: nowrap;
 }
@@ -1667,6 +1707,7 @@
   position: absolute;
   margin-right: 5px;
   right: 0;
+  top: 0;
 }
 
 #abookactions
@@ -1685,7 +1726,7 @@
   padding-left: 5px;
   padding-right: 5px;
   text-shadow: 1px 1px white;
-  background: url(images/icons/groupactions.png?v=ace6.1092) no-repeat right -70px;
+  background: url(images/icons/groupactions.png?v=6760.604) no-repeat right -70px;
 }
 
 #abookactions a.disabled
@@ -1712,3 +1753,139 @@
   top: 45px;
   position: absolute;
 }
+
+/**** Styles for widescreen (3-column) view ****/
+
+.widescreen #mailview-top {
+  bottom: 0;
+  width: 400px;
+  height: auto;
+}
+
+.widescreen #mailview-bottom {
+  left: 412px;
+  top:0;
+  border: 1px solid #a3a3a3;
+}
+
+#messagelistheader,
+.widescreen #messagelistfooter #countcontrols,
+.widescreen .messagelist > thead,
+.widescreen .messagelist .branch,
+.widescreen table.fixedcopy {
+  display: none;
+}
+
+#messagelistcontainer {
+  top: 0;
+}
+
+.widescreen #messagelistcontainer {
+  top: 21px;
+  overflow-x: hidden;
+}
+
+.widescreen #mailpreviewframe {
+  top: 0;
+}
+
+.widescreen #messagelistheader {
+  display: block;
+  top: 0;
+  white-space: nowrap;
+  border-top: 0;
+  border-bottom: 1px solid #999;
+  height: 20px;
+}
+
+.widescreen #messagelistheader .listmenu {
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 16px;
+  width: 15px;
+  background: url(images/messageicons.png?v=c493.2511) 4px -236px no-repeat;
+  cursor: pointer;
+  overflow: hidden;
+  text-indent: -5000px;
+  padding: 2px 4px;
+}
+
+.widescreen .messagelist td {
+  border-left: 0;
+  vertical-align: top;
+  padding: 3px 1px 1px !important;
+}
+
+.widescreen .messagelist td.subject {
+  width: 99%;
+  white-space: wrap;
+  position: relative; /* for span.date positioning in Firefox */
+}
+
+.widescreen .messagelist td.threads {
+  width: 14px;
+  vertical-align: middle;
+}
+
+.widescreen .messagelist td.flags {
+  width: 20px;
+}
+
+.widescreen .messagelist td.subject span {
+  line-height: 16px;
+}
+
+.widescreen .messagelist td.subject span.date {
+  right: 2px;
+  top: 3px;
+  position: absolute;
+  color: #666;
+}
+
+.widescreen .messagelist td.subject span.fromto {
+  padding-left: 18px;
+  display: block;
+  margin-right: 90px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: #666;
+}
+
+.widescreen .messagelist tr.flagged td.subject span.date,
+.widescreen .messagelist tr.flagged td.subject span.fromto {
+  color: #ff0000;
+}
+
+.widescreen .messagelist tr.selected td.subject span.date,
+.widescreen .messagelist tr.selected td.subject span.fromto {
+  color: #fff;
+}
+
+.widescreen .messagelist tr.deleted td.subject span.date,
+.widescreen .messagelist tr.deleted td.subject span.fromto {
+  color: #ccc;
+}
+
+.widescreen .messagelist td.subject span.subject {
+  clear: both;
+  display: block;
+  font-size: 13px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.widescreen .messagelist td.flags span {
+  width: 20px;
+  height: 18px;
+  display: block;
+}
+
+.widescreen .messagelist td.flags span.flag {
+  cursor: pointer;
+}
+
+.widescreen .messagelist tr td.subject span.msgicon,
+.widescreen .messagelist tr td.subject span.unreadchildren {
+  width: 18px;
+  margin: 0;
+}