diff --git a/mozilla/mail/base/content/mailCore.js b/mozilla/mail/base/content/mailCore.js
index 639c09cd181..bfd69ebb65c 100644
--- a/mozilla/mail/base/content/mailCore.js
+++ b/mozilla/mail/base/content/mailCore.js
@@ -213,4 +213,12 @@ function ShowWindowFromResource( node )
             toOpenWindow(desiredWindow);
     }
 }
+
+function zoomWindow()
+{
+  if (window.windowState == STATE_NORMAL)
+    window.maximize();
+  else
+    window.restore();
+}
 #endif
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index 4b368d53e09..89fac45975c 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -277,7 +277,8 @@
 #ifdef XP_MACOSX
 <commandset id="macWindowMenuItems">
   <!-- Mac Window menu -->
-  <command id="minimizeWindow" label="&minimizeWindow.label;" disabled="true"/>
+  <command id="minimizeWindow" label="&minimizeWindow.label;" oncommand="window.minimize();"/>
+  <command id="zoomWindow" label="&zoomWindow.label;" oncommand="zoomWindow();"/>
   <command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
   <command id="Tasks:AddressBook" oncommand="toAddressBook();"/>
 </commandset>
@@ -392,7 +393,7 @@
   <key id="key_mail"  key="&messengerCmd.commandkey;" oncommand="toMessengerWindow();" modifiers="accel"/>
   <key id="key_addressbook"  key="&addressBookCmd.commandkey;" oncommand="toAddressBook();" modifiers="accel"/>
 #ifdef XP_MACOSX
-  <!-- Mac Window keys -->
+  <!-- Mac Window and Help menu keys -->
   <key id="key_minimizeWindow" command="minimizeWindow" key="&minimizeWindow.key;" modifiers="accel"/>
   <key id="key_macHelp" key="&hintsAndTipsMac.commandkey;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');" modifiers="accel"/>
 #endif
@@ -1654,7 +1655,7 @@
           </template>
           <menupopup id="windowPopup">
             <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
-            <menuitem label="&zoomWindow.label;" disabled="true"/>
+            <menuitem command="zoomWindow"/>
             <menuseparator/>
             <menuitem label="&bringAllToFront.label;" disabled="true"/>
             <menuseparator/>
diff --git a/mozilla/mail/base/content/messageWindow.xul b/mozilla/mail/base/content/messageWindow.xul
index 4964613535d..dfdb1aa45a1 100644
--- a/mozilla/mail/base/content/messageWindow.xul
+++ b/mozilla/mail/base/content/messageWindow.xul
@@ -82,6 +82,9 @@
     <commandset id="mailEditContextMenuItems"/>
 	<commandset id="tasksCommands"/>
     <commandset id="commandKeys"/>
+#ifdef XP_MACOSX
+  <commandset id="macWindowMenuItems"/>
+#endif
   </commandset>
 
   <broadcasterset id="mailBroadcasters">
diff --git a/mozilla/mail/components/addrbook/content/addressbook.xul b/mozilla/mail/components/addrbook/content/addressbook.xul
index e63a858a77e..c22989b71cd 100644
--- a/mozilla/mail/components/addrbook/content/addressbook.xul
+++ b/mozilla/mail/components/addrbook/content/addressbook.xul
@@ -95,7 +95,8 @@
     <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')" disabled="true"/>
 #ifdef XP_MACOSX
     <!-- Mac Window menu -->
-    <command id="minimizeWindow" label="&minimizeWindow.label;" disabled="true"/>
+    <command id="minimizeWindow" label="&minimizeWindow.label;" oncommand="window.minimize();"/>
+    <command id="zoomWindow" label="&zoomWindow.label;" oncommand="zoomWindow();"/>
     <command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
 #endif
 </commandset>
@@ -442,7 +443,7 @@
             </template>
             <menupopup id="windowPopup">
               <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
-              <menuitem label="&zoomWindow.label;" disabled="true"/>
+              <menuitem command="zoomWindow"/>
               <menuseparator/>
               <menuitem label="&bringAllToFront.label;" disabled="true"/>
               <menuseparator/>
diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul
index f79428e6bf6..7e1830f9df3 100644
--- a/mozilla/mail/components/compose/content/messengercompose.xul
+++ b/mozilla/mail/components/compose/content/messengercompose.xul
@@ -139,7 +139,8 @@
 
 #ifdef XP_MACOSX
   <!-- Mac Window menu -->
-  <command id="minimizeWindow" label="&minimizeWindow.label;" disabled="true"/>
+  <command id="minimizeWindow" label="&minimizeWindow.label;" oncommand="window.minimize();"/>
+  <command id="zoomWindow" label="&zoomWindow.label;" oncommand="zoomWindow();"/>
   <command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
   <command id="Tasks:AddressBook" oncommand="toAddressBook();"/>
 #endif
@@ -479,7 +480,7 @@
           </template>
           <menupopup id="windowPopup">
             <menuitem command="minimizeWindow" key="key_minimizeWindow"/>
-            <menuitem label="&zoomWindow.label;" disabled="true"/>
+            <menuitem command="zoomWindow"/>
             <menuseparator/>
             <menuitem label="&bringAllToFront.label;" disabled="true"/>
             <menuseparator/>