window menu for OSX tweaks. Thanks to Don Crandall for the patch

mail/base/content/mailWindowOverlay.xul

@@ -278,7 +278,7 @@
   <command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
   <command id="Tasks:AddressBook" oncommand="toAddressBook();"/>
 </commandset>
-#endif
+#endif
 
 <keyset id="mailKeys">
   <key id="space" key=" " oncommand="SpaceHit(event)"/>
@@ -1556,7 +1556,7 @@
 
 #ifdef XP_MACOSX
 <!-- XXXnoririty localize! -->
-      <menu id="windowMenu" label="&windowMenu.label;" accesskey="&windowMenu.accesskey;"
+      <menu id="windowMenu" label="&windowMenu.label;"
           datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
           onpopupshown="checkFocusedWindow();">
           <template>

mail/components/addrbook/content/addressbook.xul

@@ -400,7 +400,8 @@
     
         <menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
           <menupopup id="taskPopup">
-        
+        
+
         <!-- Moving the messengerCmd menu item item to the Window menu on the Mac -->
 #ifndef XP_MACOSX
             <menuitem accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;"  key="key_mail" oncommand="toMessengerWindow();" id="tasksMenuMail" class="menuitem-iconic icon-mail16 menu-iconic"/>
@@ -419,7 +420,7 @@
         </menu>
 
 #ifdef XP_MACOSX
-        <menu id="windowMenu" label="&windowMenu.label;" accesskey="&windowMenu.accesskey;"
+        <menu id="windowMenu" label="&windowMenu.label;"
             datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
             onpopupshown="checkFocusedWindow();">
             <template>

mail/components/addrbook/locale/abMainWindow.dtd

@@ -227,6 +227,7 @@
 <!ENTITY statusText.label "">
 
 <!--  Mac OS X Window Menu -->
+<!ENTITY windowMenu.label "Window">
 <!ENTITY minimizeWindow.key "m">
 <!ENTITY minimizeWindow.label "Minimize Window">
 <!ENTITY bringAllToFront.label "Bring All to Front">