diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index 6b92c0bcf93..3bde55e57c3 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -1417,23 +1417,6 @@ function PageProxyDragGesture(aEvent)
     return false;
 }
 
-function UpdateNecessaryItems(eltIds)
-{
-  var webNav = getWebNavigation();
-  if (!webNav) return;
-  eltIds = eltIds.split(",");
-  var elt;
-  var isPostData = webNav.postData;
-  for (var i = 0; i < eltIds.length; ++i) {
-    elt = document.getElementById(eltIds[i]);
-    if (!elt) continue;
-    if (isPostData)
-      elt.setAttribute("disabled", "true");
-    else if (elt.getAttribute("disabled"))
-      elt.removeAttribute("disabled");
-  }
-}
-
 function updateComponentBarBroadcaster()
 { 
   var compBarBroadcaster = document.getElementById('cmd_viewcomponentbar');
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index 324c48e2f61..df89bb4a6c1 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -164,7 +164,7 @@
   <!-- Menu -->
   <menubar id="main-menubar" class="chromeclass-menubar">
     <menu id="menu_File">
-      <menupopup id="menu_FilePopup" onpopupshowing="UpdateNecessaryItems('cmd_sendPage','Browser:EditPage');">
+      <menupopup id="menu_FilePopup">
         <menuitem label="&browserCmd.label;" accesskey="&browserCmd.accesskey;" key="key_newNavigator" command="cmd_newNavigator"/>
         <menu id="menu_New">
           <menupopup id="menu_NewPopup">
@@ -206,7 +206,7 @@
     </menu>
 
     <menu id="menu_View" accesskey="&viewMenu.accesskey;" label="&viewMenu.label;">
-      <menupopup id="menu_View_Popup" onpopupshowing="UpdateNecessaryItems('View:PageSource');">
+      <menupopup id="menu_View_Popup">
         <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="view_toolbars">
           <menupopup id="view_toolbars_popup" onpopupshowing="updateToolbarStates(this);"> 
             <menuitem label="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewnavbar"  />
@@ -306,7 +306,8 @@
         </rule>
         <rule iscontainer="true">
           <menupopup>
-            <menu class="menu-iconic bookmark-item" uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#Name">
+            <menu class="menu-iconic bookmark-item" uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                  type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
               <menupopup />
             </menu>
           </menupopup>