diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index 156266224f2..9e239bd96c4 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1621,31 +1621,21 @@
 #endif
       
       <!-- Help -->  
-#ifdef XP_MACOSX
-<!-- Different order for OS X. Also remove "About ..." -->
-
       <menu label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
         <menupopup id="menu_HelpPopup">
+#ifdef XP_MACOSX
           <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
           <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
-          <menuseparator id="menu_HelpAboutSeparator"/>
-          <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
-                    label="&aboutCmd.label;"
-                    oncommand="window.openDialog('chrome://messenger/content/aboutDialog.xul', 'About', 'modal,centerscreen,chrome,resizable=no');"/>
-        </menupopup>
-      </menu>
 #else
-      <menu label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
-        <menupopup id="menu_HelpPopup">
           <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
           <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
+#endif
           <menuseparator id="menu_HelpAboutSeparator"/>
           <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
                     label="&aboutCmd.label;"
                     oncommand="window.openDialog('chrome://messenger/content/aboutDialog.xul', 'About', 'modal,centerscreen,chrome,resizable=no');"/>
         </menupopup>
       </menu>
-#endif
 
       <spacer flex="100%"/>
       </menubar>
diff --git a/mail/components/addrbook/content/addressbook.xul b/mail/components/addrbook/content/addressbook.xul
index 89f76325a62..a422df7cb3a 100644
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -146,6 +146,7 @@
 #ifdef XP_MACOSX
   <!-- Mac Window 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
 </keyset>
 
@@ -444,18 +445,21 @@
             </menupopup>
         </menu>
 #endif
-
         <menu label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
           <menupopup id="menu_HelpPopup">
+#ifdef XP_MACOSX
+          <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
+          <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
+#else
             <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
             <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
+#endif
             <menuseparator id="menu_HelpAboutSeparator"/>
             <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
                       label="&aboutCmd.label;"
                       oncommand="window.openDialog('chrome://messenger/content/aboutDialog.xul', 'About', 'modal,centerscreen,chrome,resizable=no');"/>
           </menupopup>
         </menu>
-
     </menubar>
    </toolbaritem>
   </toolbar>
diff --git a/mail/components/addrbook/locale/abMainWindow.dtd b/mail/components/addrbook/locale/abMainWindow.dtd
index 08052fb654d..94ae485f936 100644
--- a/mail/components/addrbook/locale/abMainWindow.dtd
+++ b/mail/components/addrbook/locale/abMainWindow.dtd
@@ -125,6 +125,7 @@
 <!ENTITY releaseCmd.accesskey                           "R">
 <!ENTITY hintsAndTips.label                             "&brandShortName; Help">
 <!ENTITY hintsAndTips.accesskey                         "h">
+<!ENTITY hintsAndTipsMac.commandkey                     "?">
 <!ENTITY aboutCmd.label                                 "About &brandShortName;">
 <!ENTITY aboutCmd.accesskey                             "A">
 
diff --git a/mail/components/compose/content/messengercompose.xul b/mail/components/compose/content/messengercompose.xul
index 4afb1a20e5a..84aab19e8a6 100644
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -209,6 +209,7 @@
 #ifdef XP_MACOSX
   <!-- Mac Window Menu -->
   <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
 
 </keyset>
@@ -492,8 +493,13 @@
       
       <menu label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
         <menupopup id="menu_HelpPopup">
+#ifdef XP_MACOSX
+          <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
+          <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
+#else
           <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
           <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
+#endif
           <menuseparator id="menu_HelpAboutSeparator"/>
           <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
                     label="&aboutCmd.label;"
diff --git a/mail/components/compose/locale/messengercompose.dtd b/mail/components/compose/locale/messengercompose.dtd
index 6e24300821b..70538bf08e6 100644
--- a/mail/components/compose/locale/messengercompose.dtd
+++ b/mail/components/compose/locale/messengercompose.dtd
@@ -183,6 +183,7 @@
 <!ENTITY releaseCmd.accesskey "R"> 
 <!ENTITY hintsAndTips.label "&brandShortName; Help">
 <!ENTITY hintsAndTips.accesskey "h"> 
+<!ENTITY hintsAndTipsMac.commandkey "?">
 <!ENTITY aboutCmd.label "About &brandShortName;">
 <!ENTITY aboutCmd.accesskey "A">