Updated toolbar icons for mail compose from Arvid.

Add a new quote button for quoting the selected message like Netscape 4.x

mail/components/compose/content/MsgComposeCommands.js

@@ -587,7 +587,7 @@ function updateComposeItems() {
 
   //Options Menu
   goUpdateCommand("cmd_spelling");
-
+  goUpdateCommand("cmd_quoteMessage");
 
   } catch(e) {}
 }
@@ -601,11 +601,6 @@ function updateEditItems() {
   goUpdateCommand("cmd_findPrev");
 }
 
-function updateOptionItems()
-{
-  goUpdateCommand("cmd_quoteMessage");
-}
-
 var messageComposeOfflineObserver = {
   observe: function(subject, topic, state) {
     // sanity checks

mail/components/compose/content/messengercompose.xul

@@ -338,7 +338,7 @@
       </menu>
   
       <menu id="optionsMenu" label="&optionsMenu.label;" accesskey="&optionsMenu.accesskey;">
-        <menupopup id="optionsMenuPopup" onpopupshowing="updateOptionItems();"> 
+        <menupopup id="optionsMenuPopup"> 
           <menuitem label="&checkSpellingCmd.label;" id="menu_checkspelling" accesskey="&checkSpellingCmd.accesskey;" key="key_checkspelling" command="cmd_spelling"/>
           <menuitem label="&quoteCmd.label;" accesskey="&quoteCmd.accesskey;" command="cmd_quoteMessage"/>
           <menuseparator/>
@@ -441,6 +441,7 @@
   </toolbar>
 
   <toolbarpalette id="MsgComposeToolbarPalette">
+    
     <toolbarbutton class="toolbarbutton-1"
                id="button-send" label="&sendButton.label;"
                tooltiptext="&sendButton.tooltip;" 
@@ -451,10 +452,12 @@
                later_tooltiptext="&sendlaterButton.tooltip;">
       <observes element="Communicator:WorkMode" attribute="offline"/>
     </toolbarbutton>
+    
     <toolbarbutton class="toolbarbutton-1"
                id="button-address" label="&addressButton.label;" 
                tooltiptext="&addressButton.tooltip;" 
                oncommand="toggleAddressPicker();"/>
+    
     <toolbarbutton class="toolbarbutton-1" type="menu-button"
                id="button-attach" label="&attachButton.label;" 
                tooltiptext="&attachButton.tooltip;" 
@@ -464,9 +467,11 @@
            <menuitem label="&attachPageCmd.label;" accesskey="&attachPageCmd.accesskey;" command="cmd_attachPage"/>
          </menupopup>
     </toolbarbutton>
+    
     <toolbarbutton class="toolbarbutton-1"
                id="spellingButton" label="&spellingButton.label;" 
                command="cmd_spelling"/>
+    
     <toolbarbutton class="toolbarbutton-1" type="menu-button"
                id="button-save" label="&saveButton.label;" 
                tooltiptext="&saveButton.tooltip;" 
@@ -478,6 +483,12 @@
            <menuitem label="&saveAsTemplateCmd.label;" accesskey="&saveAsTemplateCmd.accesskey;" command="cmd_saveAsTemplate"/>
          </menupopup>
     </toolbarbutton>
+
+    <toolbarbutton class="toolbarbutton-1"
+               id="quoteButton" label="&quoteButton.label;" 
+               tooltiptext="&quoteButton.tooltip;" 
+               command="cmd_quoteMessage"/>
+
     <toolbaritem id="throbber-box" align="center" pack="center">
       <button id="navigator-throbber" oncommand="loadThrobberUrl('compose.throbber.url')" tooltiptext="&throbber.tooltip;">
           <observes element="broadcaster_throbber" attribute="busy"/>

mail/components/compose/skin/messengercompose.css

@@ -134,6 +134,19 @@ toolbar[mode="text"] .toolbarbutton-text {
   -moz-image-region: rect(64px 192px 96px 160px) !important;
 } 
 
+#quoteButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
+  -moz-image-region: rect(0px 224px 32px 192px);
+}
+
+#quoteButton:hover {
+  -moz-image-region: rect(32px 224px 64px 192px);
+}
+
+#quoteButton[disabled="true"] {
+  -moz-image-region: rect(64px 224px 96px 192px) !important;
+}
+
 /* ::::: small primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] .toolbarbutton-1 {
@@ -205,6 +218,19 @@ toolbar[iconsize="small"] #button-save[disabled] {
   -moz-image-region: rect(40px 120px 60px 100px) !important;
 } 
 
+toolbar[iconsize="small"] #quoteButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
+  -moz-image-region: rect(0px 140px 20px 120px);
+}
+
+toolbar[iconsize="small"] #quoteButton:hover {
+  -moz-image-region: rect(20px 140px 40px 120px);
+} 
+
+toolbar[iconsize="small"] #quoteButton[disabled="true"] {
+  -moz-image-region: rect(40px 140px 60px 120px) !important;
+}
+
 /* ::::: special toolbar colors ::::: */
 
 #content-frame {