Make the toolbar mode and sets consistent

mail/base/content/mailWindowOverlay.xul

@@ -3346,12 +3346,8 @@
            fullscreentoolbar="true" mode="full"
            customizable="true"
            context="toolbar-context-menu"
-#ifdef XP_MACOSX
            iconsize="small"
-           defaultset="button-getmsg,button-newmsg,button-chat,button-address,spacer,button-tag,qfb-show-filter-bar,spring,gloda-search,button-appmenu">
-#else
-           defaultset="button-getmsg,button-newmsg,button-chat,button-address,separator,button-tag,qfb-show-filter-bar,spring,gloda-search,button-appmenu">
-#endif
+           defaultset="button-getmsg,button-newmsg,button-address,separator,button-reply,button-replyall,button-forward,separator,button-tag,button-junk,spring,qfb-show-filter-bar">
   </toolbar>
 
   <toolbarset id="customToolbars" context="toolbar-context-menu"/>

mail/components/addrbook/content/addressbook.xul

@@ -638,12 +638,8 @@
            fullscreentoolbar="true" mode="full"
            customizable="true"
            context="toolbar-context-menu"
-#ifdef XP_MACOSX
            iconsize="small"
-           defaultset="button-newcard,button-newlist,spacer,button-editcard,button-newmessage,spacer,button-abdelete,spring,search-container">
-#else
            defaultset="button-newcard,button-newlist,separator,button-editcard,button-newmessage,separator,button-abdelete,spring,search-container">
-#endif
    </toolbar>
    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
   </toolbox>

mail/components/compose/content/messengercompose.xul

@@ -885,12 +885,8 @@
            toolbarname="&showCompositionToolbarCmd.label;"
            accesskey="&showCompositionToolbarCmd.accesskey;"
            fullscreentoolbar="true" mode="full"
-#ifdef XP_MACOSX
            iconsize="small"
-           defaultset="button-send,separator,button-address,spellingButton,button-attach,button-security,button-save,spring"
-#else
-           defaultset="button-send,separator,button-address,spellingButton,button-attach,button-security,button-save"
-#endif
+           defaultset="button-send,separator,spellingButton,button-attach,button-security,button-save"
            customizable="true" context="toolbar-context-menu">
   </toolbar>