diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 2d8a1f9aa53..1f3200a6608 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -450,8 +450,8 @@ END of Deprecated -->
 
      <menuitem value="&domviewer.label;" oncommand="window._content.location.href='chrome://communicator/content/domviewer/DOMDataSourceViewer.xul'"/>
      <menuitem value="&browserbuster.label;" oncommand="window._content.location.href='http://komodo.mozilla.org/buster/'"/>
-     <!-- TEMPORARY UNTIL -edit WORKS TO STARTUP COMPOSER (bug 16789)  -->
-     <menuitem value="Composer with Test Page" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
+     <menuitem value="&editor-test-page.label;" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
+     <menuitem value="&install-psm.label;" oncommand="window._content.location.href='http://docs.iplanet.com/docs/manuals/psm/psm-mozilla/index.html'"/>
     
     </menupopup>
   </menu>
diff --git a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
index cee2db54c1a..493bacd8d22 100644
--- a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -253,6 +253,8 @@
 <!-- LOCALIZATION NOTE BEGIN : DO not localize the entities below; debug --> 
 <!ENTITY domviewer.label "DOM Viewer">
 <!ENTITY browserbuster.label "chofmann's browser buster">
+<!ENTITY editor-test-page.label "Composer with test page">
+<!ENTITY install-psm.label "Install PSM">
 <!-- LOCALIZATION NOTE END : DO not localize the entities above; debug --> 
 
 <!-- LOCALIZATION NOTE BEGIN : DO not localize the entities below; test case -->