diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
index 7559de81868..058ace1c7d5 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -1186,14 +1186,14 @@ nsWebShellWindow::CreatePopup(nsIDOMElement* aElement, nsIDOMElement* aPopupCont
   if ( !popupContent ) 
     return NS_OK; // It's ok. Really.
   
-  // Fire the CONSTRUCT DOM event to give JS/C++ a chance to build the popup
+  // Fire the create DOM event to give JS/C++ a chance to build the popup
   // dynamically. After we fire off the event, make sure we check the result
   // for |nsEventStatus_eConsumeNoDefault| which translates into an event
   // handler returning false. If that happens, abort creating the popup.
   nsEventStatus status = nsEventStatus_eIgnore;
   nsMouseEvent event;
   event.eventStructType = NS_EVENT;
-  event.message = NS_POPUP_CONSTRUCT;
+  event.message = NS_MENU_CREATE;
   rv = popupContent->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
   if ( NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault )
     return rv;
@@ -1218,11 +1218,11 @@ nsWebShellWindow::CreatePopup(nsIDOMElement* aElement, nsIDOMElement* aPopupCont
     // XXX Need to distinguish between popup menus and context menus?
     DoContextMenu(nsnull, rootElement, mWindow, aXPos, aYPos, aPopupAlignment, anAnchorAlignment);
 
-    // Fire the DESTRUCT DOM event to give JS/C++ a chance to destroy the popup contents
+    // Fire the destroy DOM event to give JS/C++ a chance to destroy the popup contents
     nsEventStatus status = nsEventStatus_eIgnore;
     nsMouseEvent event;
     event.eventStructType = NS_EVENT;
-    event.message = NS_POPUP_DESTRUCT;
+    event.message = NS_MENU_DESTROY;
     rv = popupContent->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
     return rv;
   }
diff --git a/mozilla/xpfe/browser/src/navigator.xul b/mozilla/xpfe/browser/src/navigator.xul
index d1d9c243c57..ee450e21ff0 100644
--- a/mozilla/xpfe/browser/src/navigator.xul
+++ b/mozilla/xpfe/browser/src/navigator.xul
@@ -270,8 +270,14 @@ Contributor(s): ______________________________________. -->
 <!ENTITY  notifCom.label "[Notification Component]">
 <!ENTITY  statusText.label "Document: Done">
 <<<<<<< navigator.xul
+<<<<<<< navigator.xul
+<!ENTITY  buildId.label "Build ID: 1999070517">
+=======
+=======
+<<<<<<< navigator.xul
 <!ENTITY  buildId.label "Build ID: 1999062415">
 =======
+>>>>>>> 1.164
 <!ENTITY  buildId.label "Build ID: 1999070614">
 >>>>>>> 1.162
 <!ENTITY  security-button.label "Secure Conn">
@@ -657,6 +663,27 @@ Contributor(s): ______________________________________. -->
   </menubar>
   
    <toolbox>
+    <xpmenubar chromeclass="menubar">
+	  <xpmenu>
+	    <html:u>F</html:u>ile
+	  </xpmenu>
+	  <xpmenu>
+	    <html:u>E</html:u>dit
+	  </xpmenu>
+	  <xpmenu>
+	    <html:u>V</html:u>iew
+	  </xpmenu>
+	  <xpmenu>
+	    <html:u>I</html:u>nsert
+	  </xpmenu>
+	  <xpmenu>
+	    <html:u>P</html:u>roject
+	  </xpmenu>
+	  <xpmenu>
+	    <html:u>B</html:u>uild
+	  </xpmenu>
+    </xpmenubar>
+
     <toolbar class="main-bar" chromeclass="toolbar">
 		  <titledbutton id="back-button" align="bottom" value="&backButton.label;" onclick="BrowserBack()">	
 				  <observes element="canGoBack" attribute="disabled" onChange="BrowserSetBack()"/>