fix for bug #190825. add junk mail icon to header pane for messages we think are junk.

also, fix for bug #185269 (fix classic skin icon in thread pane and thread pane column header)
r/sr=bienvenu

suite/themes/classic/jar.mn

@@ -314,7 +314,6 @@ classic.jar:
   skin/classic/messenger/smime/icons/hdrSignNotOk.gif                   (messenger/smime/icons/hdrSignNotOk.gif)
   skin/classic/messenger/smime/icons/hdrCryptoOk.gif                    (messenger/smime/icons/hdrCryptoOk.gif)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.gif                 (messenger/smime/icons/hdrCryptoNotOk.gif)
-  skin/classic/messenger/icons/message-junk-other.gif                   (messenger/icons/message-junk-other.gif)
   skin/classic/navigator/contents.rdf                                   (navigator/contents.rdf)
   skin/classic/navigator/navigator.css                                  (navigator/navigator.css)
   skin/classic/navigator/linkToolbar.css                                (navigator/linkToolbar.css)

suite/themes/classic/messenger/mailWindow1.css

@@ -118,3 +118,5 @@
 #messagepanebox[focusring="true"] > #messagepane {
   border-color: #000000;
 }
+
+

suite/themes/classic/messenger/primaryToolbar.css

@@ -227,3 +227,16 @@
 #button-junk[disabled="true"] {
   list-style-image: url("chrome://messenger/skin/icons/junk-dis.gif");
 }
+
+#junkBarImage {
+  list-style-image: url("chrome://messenger/skin/icons/junk.gif");
+}
+
+#junkBarMessage {
+  font-weight: bold;
+}
+
+#junkBar {
+  border-bottom: 1px solid;
+  -moz-border-bottom-colors: #000000;
+}

suite/themes/classic/messenger/threadPane.css

@@ -140,7 +140,7 @@ treechildren:-moz-tree-image(flaggedCol, flagged) {
 /* ..... junkStatus column ..... */
 
 treecol.junkStatusHeader {
-  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
@@ -151,7 +151,7 @@ treechildren:-moz-tree-image(junkStatusCol) {
 }
 
 treechildren:-moz-tree-image(junkStatusCol, junk) {
-  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
 }
 
 treechildren:-moz-tree-image(junkStatusCol, notjunk) {

suite/themes/modern/jar.mn

@@ -397,6 +397,7 @@ modern.jar:
   skin/modern/messenger/icons/junk-act.gif                         (messenger/icons/junk-act.gif)
   skin/modern/messenger/icons/junk-hov.gif                         (messenger/icons/junk-hov.gif)
   skin/modern/messenger/icons/junk-dis.gif                         (messenger/icons/junk-dis.gif)
+  skin/modern/messenger/icons/junkBar.gif                          (messenger/icons/junkBar.gif)
   skin/modern/messenger/icons/message-junk-other.gif               (messenger/icons/message-junk-other.gif)
   skin/modern/messenger/messengercompose/messengercompose.css      (messenger/messengercompose/messengercompose.css)
   skin/modern/messenger/messengercompose/icons/mast-msgcomp.gif    (messenger/messengercompose/icons/mast-msgcomp.gif)

suite/themes/modern/messenger/messageWindow.css

@@ -43,5 +43,3 @@
 @import url("chrome://messenger/skin/primaryToolbar.css");
   
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: folder icons for menus ::::: */

suite/themes/modern/messenger/primaryToolbar.css

@@ -248,3 +248,16 @@
   list-style-image: url("chrome://messenger/skin/icons/junk-dis.gif");
 }
 
+#junkBarImage {
+  list-style-image: url("chrome://messenger/skin/icons/junkBar.gif");
+}
+
+#junkBarMessage {
+  font-weight: bold;
+}
+
+#junkBar {
+  border-bottom: 1px solid;
+  -moz-border-bottom-colors: #000000;
+}
+