fix for bug #98299. clean up fallout from #97487. rs=bienvenu

themes/classic/jar.mn

@@ -521,10 +521,6 @@ classic.jar:
     skin/classic/messenger/messengercompose/sendlater-hover-active.gif   (messenger/messengercompose/sendlater-hover-active.gif)
     skin/classic/messenger/messengercompose/sendlater-hover.gif          (messenger/messengercompose/sendlater-hover.gif)
     skin/classic/messenger/messengercompose/sendlater.gif                (messenger/messengercompose/sendlater.gif)
-    skin/classic/messenger/messengercompose/spelling-disabled.gif        (messenger/messengercompose/spelling-disabled.gif)
-    skin/classic/messenger/messengercompose/spelling-hover-active.gif    (messenger/messengercompose/spelling-hover-active.gif)
-    skin/classic/messenger/messengercompose/spelling-hover.gif           (messenger/messengercompose/spelling-hover.gif)
-    skin/classic/messenger/messengercompose/spelling.gif                 (messenger/messengercompose/spelling.gif)
     skin/classic/messenger/messengercompose/stop.gif                     (messenger/messengercompose/stop.gif)
     skin/classic/messenger/messengercompose/sendConvAltering.gif         (messenger/messengercompose/sendConvAltering.gif)
     skin/classic/messenger/messengercompose/sendConvNo.gif               (messenger/messengercompose/sendConvNo.gif)

themes/classic/messenger/mac/resources.xml

@@ -61,8 +61,8 @@
     	<image src="chrome://messenger/skin/messengercompose/attach-hover-active.gif"/>
     	<image src="chrome://messenger/skin/messengercompose/quote-hover.gif"/>
     	<image src="chrome://messenger/skin/messengercompose/quote-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/spelling-hover.gif"/>
+    	<image src="chrome://editor/skin/images/spell-hover.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/spelling-hover-active.gif"/>
+    	<image src="chrome://editor/skin/images/spell-hover-active.gif"/>
     	<image src="chrome://messenger/skin/messengercompose/savemsg-hover.gif"/>
     	<image src="chrome://messenger/skin/messengercompose/savemsg-hover-active.gif"/>
     	<image src="chrome://global/skin/stop-hover.gif"/>
@@ -70,4 +70,4 @@
      </resources>
   </binding>        
 
-</bindings>          
+</bindings>          

themes/classic/messenger/win/resources.xml

@@ -63,8 +63,8 @@
       <image src="chrome://messenger/skin/messengercompose/attach-hover-active.gif"/>
       <image src="chrome://messenger/skin/messengercompose/quote-hover.gif"/>
       <image src="chrome://messenger/skin/messengercompose/quote-hover-active.gif"/>
-      <image src="chrome://messenger/skin/messengercompose/spelling-hover.gif"/>
+      <image src="chrome://editor/skin/images/spell-hover.gif"/>
-      <image src="chrome://messenger/skin/messengercompose/spelling-hover-active.gif"/>
+      <image src="chrome://editor/skin/images/spell-hover-active.gif"/>
       <image src="chrome://messenger/skin/messengercompose/savemsg-hover.gif"/>
       <image src="chrome://messenger/skin/messengercompose/savemsg-hover-active.gif"/>
       <image src="chrome://global/skin/stop-hover.gif"/>
@@ -72,4 +72,4 @@
     </resources>
   </binding>        
 
-</bindings>          
+</bindings>          

themes/modern/messenger/messengercompose/messengercompose.css

@@ -98,10 +98,6 @@
   list-style-image: url("chrome://messenger/skin/messengercompose/btn1/attach-act.gif");
 } 
 
-#spellingButton {
-  list-style-image: url("chrome://editor/skin/messengercompose/btn1/spell.gif");
-}
-
 #spellingButton {
   list-style-image: url("chrome://editor/skin/btn1/spell.gif");
 }
@@ -267,3 +263,4 @@ spring.spacer {
 .label {
   color: #000000;
 }
+

themes/modern/messenger/resources.xml

@@ -37,12 +37,12 @@
       <image src="chrome://messenger/skin/messengercompose/btn1/address-act.gif"/>
       <image src="chrome://messenger/skin/messengercompose/btn1/attach-hov.gif"/>
       <image src="chrome://messenger/skin/messengercompose/btn1/attach-act.gif"/>
-      <image src="chrome://editor/skin/messengercompose/btn1/spell-hov.gif"/>
+      <image src="chrome://editor/skin/btn1/spell-hov.gif"/>
-      <image src="chrome://editor/skin/messengercompose/btn1/spell-act.gif"/>
+      <image src="chrome://editor/skin/btn1/spell-act.gif"/>
       <image src="chrome://editor/skin/btn1/savefile-hov.gif"/>
       <image src="chrome://editor/skin/btn1/savefile-act.gif"/>
       <image src="chrome://communicator/skin/btn1/stop-hov.gif"/>
       <image src="chrome://communicator/skin/btn1/stop-act.gif"/>
     </resources>
   </binding>        
-</bindings>
+</bindings>