--- a/skins/classic/common.css	Sat Dec 29 06:32:49 2018 -0500
+++ b/skins/classic/common.css	Sat Dec 29 07:07:34 2018 -0500
@@ -26,10 +26,6 @@
   font-family: inherit;
 }
 
-html.mozilla select {
-  padding: 2px 1px;
-}
-
 th
 {
   font-weight: normal;
@@ -104,7 +100,7 @@
   font-size: 12px;
   padding-left: 8px;
   padding-right: 8px;
-  background: url(images/buttons/bg.gif?v=30b2.196) repeat-x #f0f0f0;
+  background: url(images/buttons/bg.gif?v=0200.203) repeat-x #f0f0f0;
   border: 1px solid #a4a4a4;
 }
 
@@ -161,6 +157,15 @@
   display: none;
 }
 
+.noselect
+{
+  user-select: none;
+  -moz-user-select: none;
+  -khtml-user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+}
+
 /* fixes vertical alignment of checkboxes and labels */
 label input,
 label span
@@ -198,7 +203,7 @@
   right: 0px;
   height: 24px;
   left: 250px;
-  background: url(images/taskbar.png?v=3878.1902) top right no-repeat;
+  background: url(images/taskbar.png?v=11a3.1640) top right no-repeat;
   padding: 10px 6px 5px 0px;
   text-align: right;
   white-space: nowrap;
@@ -211,7 +216,7 @@
   color: #666666;
   text-decoration: none;
   padding: 6px 12px 6px 26px;
-  background: url(images/taskicons.gif?v=b8e0.1519) no-repeat;
+  background: url(images/taskicons.gif?v=9719.2207) no-repeat;
 }
 
 #taskbar a:hover
@@ -260,6 +265,7 @@
 
 body > #message div.notice,
 body > #messagebody .part-notice,
+body > #mainscreen #messagebody .part-notice,
 #message-objects div.notice
 {
   background: url(images/display/icons.png?v=e866.4201) 6px 3px no-repeat;
@@ -324,7 +330,7 @@
 .boxtitle
 {
   height: 12px !important;
-  padding: 2px 10px 5px 5px;
+  padding: 3px 10px 4px 5px;
   border-bottom: 1px solid #999;
   color: #333;
   font-size: 11px;
@@ -355,6 +361,16 @@
   background-color: #F2F2F2;
 }
 
+.boxcontent .boxwarning
+{
+  margin: 0 0 10px;
+  display: block;
+  min-height: 22px;
+  background: url(images/display/icons.png?v=e866.4201) #EF9398 6px -95px no-repeat;
+  border: 1px solid #DC5757;
+  padding: 8px 10px 8px 46px;
+}
+
 .boxcontent table td.title
 {
   color: #666;
@@ -407,7 +423,7 @@
   padding: 0px;
   margin: 0;
   overflow: hidden;
-  background: url(images/icons/groupactions.png?v=ace6.1092) 0 0 no-repeat transparent;
+  background: url(images/icons/groupactions.png?v=6760.604) 0 0 no-repeat transparent;
   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
 }
 
@@ -442,9 +458,8 @@
   height: 11px;
   padding: 0;
   margin: 1px;
-  margin-top: 2px;
   overflow: hidden;
-  background: url(images/pagenav.gif?v=2e75.355) 0 0 no-repeat transparent;
+  background: url(images/pagenav.gif?v=8464.1147) 0 0 no-repeat transparent;
   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
 }
 
@@ -480,6 +495,34 @@
   background-position: -33px -11px;
 }
 
+#rcmcountdisplay
+{
+  float: left;
+  margin-right: 10px;
+}
+
+#countcontrols #pagejumper
+{
+  margin: 0 5px;
+  float: right;
+  text-align: center;
+  padding: 0;
+  cursor: default;
+  font-size: 10px;
+}
+
+.toolbarseparator {
+  display: block;
+  float: left;
+  width: 5px;
+  height: 32px;
+  padding: 0;
+  margin: 0 5px;
+  overflow: hidden;
+  background: url(images/abook_toolbar.png?v=8259.4881) -162px 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
 .splitter
 {
   user-select: none;
@@ -544,9 +587,10 @@
 {
   display: block;
   color: #a0a0a0;
-  padding: 2px 16px 2px 10px;
+  padding: 3px 16px 3px 10px;
   text-decoration: none;
   min-height: 14px;
+  line-height: 14px;
   background: transparent;
 }
 
@@ -580,7 +624,7 @@
 
 .popupmenu.selectable li a.selected
 {
-  background: url(images/messageicons.png?v=16cb.2581) 2px -372px no-repeat;
+  background: url(images/messageicons.png?v=c493.2511) 2px -372px no-repeat;
 }
 
 .popupmenu.selectable li a
@@ -602,13 +646,13 @@
 
 .dropbutton:hover
 {
-/*  background: url(images/dbutton.png?v=7bba.240) 0 0 no-repeat transparent; */
+/*  background: url(images/dbutton.png?v=4d5a.230) 0 0 no-repeat transparent; */
 }
 
 .dropbutton span
 {
   width: 9px;
-  background: url(images/dbutton.png?v=7bba.240) -53px 0 no-repeat transparent;
+  background: url(images/dbutton.png?v=4d5a.230) -53px 0 no-repeat transparent;
 }
 
 .dropbutton span:hover
@@ -666,6 +710,11 @@
   background-color: #CC3333;
 }
 
+table.records-table tr.selected td a
+{
+  color: #FFFFFF;
+}
+
 table.records-table tr.focused td
 {
 }
@@ -708,7 +757,7 @@
 
 ul.treelist li div.expanded
 {
-  background: url(images/icons/expanded.png?v=f647.107) bottom right no-repeat;
+  background: url(images/icons/expanded.png?v=3a53.89) bottom right no-repeat;
 }
 
 ul.treelist,
@@ -822,7 +871,7 @@
   padding-bottom: 2px;
   text-decoration: none;
   height: 15px;
-  background: url(images/icons/folders.png?v=d9d2.5356) 5px 1px no-repeat;
+  background: url(images/icons/folders.png?v=7c4f.5218) 5px 1px no-repeat;
 }
 
 .folderlist li.virtual > a
@@ -933,7 +982,7 @@
   width: 190px;
   height: 20px;
   text-align: right;
-  background: url(images/searchfield.gif?v=aaf8.313) top left no-repeat;
+  background: url(images/searchfield.gif?v=36a5.397) top left no-repeat;
 }
 
 #quicksearchbar
@@ -978,7 +1027,7 @@
   width: 16px;
   height: 16px;
   overflow: hidden;
-  background: url(images/icons/glass.png?v=6b06.406) top left no-repeat;
+  background: url(images/icons/glass.png?v=dcbc.302) top left no-repeat;
 }
 
 #quicksearchbar img
@@ -1080,7 +1129,7 @@
   content: " ";
   width: 14px;
   height: 14px;
-  background: url(images/messageactions.png?v=d93e.3223) -2px -128px no-repeat;
+  background: url(images/messageactions.png?v=8c64.2615) -2px -128px no-repeat;
 }
 
 a.rcmContactAddress
@@ -1119,7 +1168,8 @@
   cursor: pointer;
 }
 
-#rcmKSearchpane ul li.selected
+#rcmKSearchpane ul li.selected,
+#pagejump-selector ul li.selected
 {
   color: #ffffff;
   background-color: #CC3333;
@@ -1130,7 +1180,7 @@
   margin-left: auto;
   margin-right: auto;
   margin-top: 50px;
-  width: 420px;
+  width: 400px;
   border: 1px solid #999;
 }
 
@@ -1205,9 +1255,10 @@
 {
   display: block;
   color: #a0a0a0;
-  padding: 1px 12px 3px 28px;
+  padding: 3px 12px 3px 28px;
   text-decoration: none;
   min-height: 14px;
+  line-height: 14px;
 }
 
 ul.toolbarmenu li a.active,
@@ -1267,6 +1318,35 @@
   margin: 1px 4px 1px;
 }
 
+#searchmenu ul.toolbarmenu li label
+{
+  padding: 2px 0;
+  color: black;
+}
+
+#searchmenu ul.toolbarmenu li label.comment
+{
+  color: #999;
+}
+
+#searchmenu select
+{
+  width: 100%;
+}
+
+#pagejump-selector
+{
+  max-height: 250px;
+  overflow-x: hidden;
+}
+
+#pagejump-selector ul li
+{
+  min-width: 45px;
+  padding: 2px 5px;
+  cursor: default;
+}
+
 
 /*** folder selector ***/
 
@@ -1277,7 +1357,7 @@
 
 #folder-selector li a span
 {
-  background: url(images/icons/folders.png?v=d9d2.5356) no-repeat 6px 0;
+  background: url(images/icons/folders.png?v=7c4f.5218) no-repeat 6px 0;
   display: block;
   height: 15px;
   min-height: 14px;
@@ -1347,7 +1427,7 @@
   height: 23px !important;
   height: 22px;
   overflow: hidden;
-  background: url(images/tabs-left.gif?v=0541.219) top left no-repeat;
+  background: url(images/tabs-left.gif?v=d7b0.230) top left no-repeat;
 }
 
 span.tablink
@@ -1374,7 +1454,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
-  background: url(images/tabs-right.gif?v=5414.733) top right no-repeat;
+  background: url(images/tabs-right.gif?v=5c83.1417) top right no-repeat;
 }
 
 span.tablink-selected a
@@ -1410,9 +1490,9 @@
   cursor: default;
 }
 .quota_bg { background-color: white; }
-.quota_high { background: url(images/quota-colors.png?v=c1e9.287) repeat-x 0 -28px #f90509; }
-.quota_mid { background: url(images/quota-colors.png?v=c1e9.287) repeat-x 0 -14px #e3e909; }
-.quota_low { background: url(images/quota-colors.png?v=c1e9.287) repeat-x 0 0px #05f905; }
+.quota_high { background: url(images/quota-colors.png?v=e7fa.219) repeat-x 0 -28px #f90509; }
+.quota_mid { background: url(images/quota-colors.png?v=e7fa.219) repeat-x 0 -14px #e3e909; }
+.quota_low { background: url(images/quota-colors.png?v=e7fa.219) repeat-x 0 0px #05f905; }
 .quota_text_high { color: white; }
 .quota_text_mid { color: #666; }
 .quota_text_low { color: #666; }
@@ -1475,7 +1555,7 @@
 }
 
 #image-selector-form.droptarget {
-  background: url(images/filedrop.png?v=deab.605) center bottom no-repeat;
+  background: url(images/filedrop.png?v=080e.581) center bottom no-repeat;
 }
 
 #image-selector-form.droptarget.hover
@@ -1485,3 +1565,57 @@
   -moz-box-shadow: 0 0 5px 0 #999;
   -o-box-shadow: 0 0 5px 0 #999;
 }
+
+/** PGP key import dialog **/
+.pgpkeyimport div.key {
+  position: relative;
+  margin-bottom: 2px;
+  padding: 1em 1em 5px;
+  background-color: #ebebeb;
+}
+
+.pgpkeyimport div.key.revoked,
+.pgpkeyimport div.key.disabled {
+  color: #a0a0a0;
+}
+
+.pgpkeyimport div.key label {
+  display: inline-block;
+  margin-right: 0.5em;
+}
+
+.pgpkeyimport div.key label:after {
+  content: ":";
+}
+
+.pgpkeyimport div.key label + a,
+.pgpkeyimport div.key label + span {
+  display: inline-block;
+  margin-right: 2em;
+  white-space: nowrap;
+}
+
+.pgpkeyimport div.key label + a {
+  font-weight: bold;
+}
+
+.pgpkeyimport ul.uids {
+  margin: 5px 1em 0 1em;
+  padding: 0;
+}
+
+.pgpkeyimport li.uid {
+  border: 0;
+  padding: 2px;
+}
+
+.pgpkeyimport div.key input.button.importkey {
+  position: absolute;
+  top: 0.8em;
+  right: 0.8em;
+  padding: 2px 6px;
+}
+
+.pgpkeyimport div.key input.button[disabled] {
+  display: none;
+}