diff --git a/mozilla/cmd/xfe/resources b/mozilla/cmd/xfe/resources
index 8067c49507d..82daee6f8c6 100644
--- a/mozilla/cmd/xfe/resources
+++ b/mozilla/cmd/xfe/resources
@@ -3140,7 +3140,6 @@ Open the mail folders and discussion groups window
 Open the address book
 
 *menuBar*bookmarksSubmenu.labelString:			Bookmarks
-*menuBar*bookmarksSubmenu.mnemonic:				B
 
 *menuBar*toolsSubmenu.labelString:			Tools
 *menuBar*toolsSubmenu.mnemonic:				T
diff --git a/mozilla/cmd/xfe/src/AddrBookFrame.cpp b/mozilla/cmd/xfe/src/AddrBookFrame.cpp
index a77d1fc1b1e..529691958b1 100644
--- a/mozilla/cmd/xfe/src/AddrBookFrame.cpp
+++ b/mozilla/cmd/xfe/src/AddrBookFrame.cpp
@@ -159,6 +159,7 @@ MenuSpec XFE_AddrBookFrame::menu_bar_spec[] = {
     (MenuSpec*)&XFE_AddrBookFrame::view_menu_spec },
   { xfeMenuWindow, 	CASCADEBUTTON, 
     (MenuSpec*)&XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON,
     (MenuSpec*)&XFE_Frame::help_menu_spec },
   { NULL }
diff --git a/mozilla/cmd/xfe/src/BookmarkFrame.cpp b/mozilla/cmd/xfe/src/BookmarkFrame.cpp
index 7095abcef71..bb95839d5cc 100644
--- a/mozilla/cmd/xfe/src/BookmarkFrame.cpp
+++ b/mozilla/cmd/xfe/src/BookmarkFrame.cpp
@@ -109,6 +109,7 @@ MenuSpec XFE_BookmarkFrame::menu_bar_spec[] = {
   { xfeMenuEdit,	CASCADEBUTTON, edit_menu_spec },
   { xfeMenuView,	CASCADEBUTTON, view_menu_spec },
   { xfeMenuWindow,	CASCADEBUTTON, XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/BrowserFrame.cpp b/mozilla/cmd/xfe/src/BrowserFrame.cpp
index 17d36faf53e..79a4a162f57 100644
--- a/mozilla/cmd/xfe/src/BrowserFrame.cpp
+++ b/mozilla/cmd/xfe/src/BrowserFrame.cpp
@@ -192,6 +192,7 @@ MenuSpec XFE_BrowserFrame::menu_bar_spec[] = {
   { xfeMenuView, 	CASCADEBUTTON, (MenuSpec*)&XFE_BrowserFrame::view_menu_spec },
   { xfeMenuGo,		CASCADEBUTTON, (MenuSpec*)&XFE_BrowserFrame::go_menu_spec },
   { xfeMenuWindow, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/ComposeFrame.cpp b/mozilla/cmd/xfe/src/ComposeFrame.cpp
index 36a2bdd77e2..5d4a717d57f 100644
--- a/mozilla/cmd/xfe/src/ComposeFrame.cpp
+++ b/mozilla/cmd/xfe/src/ComposeFrame.cpp
@@ -193,6 +193,7 @@ MenuSpec XFE_ComposeFrame::menu_bar_spec[] = {
   { xfeMenuView, 	CASCADEBUTTON, (MenuSpec*)&XFE_ComposeFrame::view_menu_spec },
   { xfeMenuTools, 	CASCADEBUTTON, (MenuSpec*)&text_tools_menu_spec },
   { xfeMenuWindow, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp,        CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec},
   { NULL }
 };
@@ -285,6 +286,7 @@ MenuSpec XFE_ComposeFrame::html_menu_bar_spec[] = {
   { xfeMenuTools, 	CASCADEBUTTON,
 	(MenuSpec*)&XFE_EditorFrame::tools_menu_spec },
   { xfeMenuWindow, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/EditorFrame.cpp b/mozilla/cmd/xfe/src/EditorFrame.cpp
index f80f9ca70c1..964d7e6394c 100644
--- a/mozilla/cmd/xfe/src/EditorFrame.cpp
+++ b/mozilla/cmd/xfe/src/EditorFrame.cpp
@@ -351,6 +351,7 @@ MenuSpec XFE_EditorFrame::menu_bar_spec[] = {
   { xfeMenuTools, 	CASCADEBUTTON,
 	(MenuSpec*)&XFE_EditorFrame::tools_menu_spec },
   { xfeMenuWindow, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/FolderFrame.cpp b/mozilla/cmd/xfe/src/FolderFrame.cpp
index 90e2073ad52..809dd14f558 100644
--- a/mozilla/cmd/xfe/src/FolderFrame.cpp
+++ b/mozilla/cmd/xfe/src/FolderFrame.cpp
@@ -117,6 +117,7 @@ MenuSpec XFE_FolderFrame::menu_bar_spec[] = {
   { xfeMenuEdit, 	CASCADEBUTTON, edit_menu_spec },
   { xfeMenuView, 	CASCADEBUTTON, view_menu_spec },
   { xfeMenuWindow,	CASCADEBUTTON, XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/Frame.cpp b/mozilla/cmd/xfe/src/Frame.cpp
index 152065bbd59..6750e0cf15a 100644
--- a/mozilla/cmd/xfe/src/Frame.cpp
+++ b/mozilla/cmd/xfe/src/Frame.cpp
@@ -53,6 +53,7 @@
 #include "Minibuffer.h"
 #include "Toolbox.h"
 #include "Dashboard.h"
+#include "URLBar.h"
 #include "Logo.h"
 #include "Netcaster.h"
 #include "ViewGlue.h"
@@ -165,8 +166,10 @@ MenuSpec XFE_Frame::bookmark_submenu_spec[] = {
 	{ "fileBookmarksSubmenu",     DYNA_FANCY_CASCADEBUTTON, NULL, NULL, False, (void*)True, XFE_BookmarkMenu::generate },
 	{ xfeCmdOpenBookmarks,	PUSHBUTTON },
 	MENU_SEPARATOR,
+#ifdef BULLSHIT
 	{ "placesSubmenu",            CASCADEBUTTON, XFE_Frame::places_menu_spec},
 	MENU_SEPARATOR,
+#endif
 	{ "bookmarkPlaceHolder",	DYNA_MENUITEMS, NULL, NULL, False, (void*)False, XFE_BookmarkMenu::generate },
 	{ NULL }
 };
@@ -239,7 +242,6 @@ MenuSpec XFE_Frame::window_menu_spec[] = {
 	{ xfeCmdOpenFolders,			PUSHBUTTON },
 	{ xfeCmdOpenAddressBook,		PUSHBUTTON },
 #endif
-	{ "bookmarksSubmenu",	CASCADEBUTTON, bookmark_submenu_spec },
 	{ xfeCmdOpenHistory,		PUSHBUTTON },
 #ifdef JAVA
 	{ xfeCmdJavaConsole,		PUSHBUTTON },
diff --git a/mozilla/cmd/xfe/src/HistoryFrame.cpp b/mozilla/cmd/xfe/src/HistoryFrame.cpp
index 2e70858d758..b6df2b1d741 100644
--- a/mozilla/cmd/xfe/src/HistoryFrame.cpp
+++ b/mozilla/cmd/xfe/src/HistoryFrame.cpp
@@ -101,6 +101,7 @@ MenuSpec XFE_HistoryFrame::menu_bar_spec[] = {
   { xfeMenuEdit,	CASCADEBUTTON, edit_menu_spec },
   { xfeMenuView,	CASCADEBUTTON, view_menu_spec },
   { xfeMenuWindow,	CASCADEBUTTON, XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/MsgFrame.cpp b/mozilla/cmd/xfe/src/MsgFrame.cpp
index d276a2eea04..de9fdb2567f 100644
--- a/mozilla/cmd/xfe/src/MsgFrame.cpp
+++ b/mozilla/cmd/xfe/src/MsgFrame.cpp
@@ -209,6 +209,7 @@ MenuSpec XFE_MsgFrame::menu_bar_spec[] = {
   { xfeMenuGo,	 	CASCADEBUTTON, XFE_ThreadFrame::go_menu_spec },
   { xfeMenuMessage, 	CASCADEBUTTON, message_menu_spec },
   { xfeMenuWindow,	CASCADEBUTTON, XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/NavCenterFrame.cpp b/mozilla/cmd/xfe/src/NavCenterFrame.cpp
index 88f5f2381ef..05fa9a738d7 100644
--- a/mozilla/cmd/xfe/src/NavCenterFrame.cpp
+++ b/mozilla/cmd/xfe/src/NavCenterFrame.cpp
@@ -42,6 +42,7 @@ MenuSpec XFE_NavCenterFrame::file_menu_spec[] = {
 MenuSpec XFE_NavCenterFrame::menu_bar_spec[] = {
   { xfeMenuFile, 	CASCADEBUTTON, (MenuSpec*)&XFE_NavCenterFrame::file_menu_spec },
   { xfeMenuWindow, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
   { xfeMenuHelp, 	CASCADEBUTTON, (MenuSpec*)&XFE_Frame::help_menu_spec },
   { NULL }
 };
diff --git a/mozilla/cmd/xfe/src/ThreadFrame.cpp b/mozilla/cmd/xfe/src/ThreadFrame.cpp
index 8dfa4944c8e..77c2b337b43 100644
--- a/mozilla/cmd/xfe/src/ThreadFrame.cpp
+++ b/mozilla/cmd/xfe/src/ThreadFrame.cpp
@@ -319,6 +319,7 @@ MenuSpec XFE_ThreadFrame::menu_bar_spec[] = {
 	{ xfeMenuGo, 		CASCADEBUTTON, go_menu_spec },
 	{ xfeMenuMessage, 	CASCADEBUTTON, message_menu_spec },
 	{ xfeMenuWindow,	CASCADEBUTTON, XFE_Frame::window_menu_spec },
+  { "bookmarksSubmenu",	CASCADEBUTTON, XFE_Frame::bookmark_submenu_spec },
 	{ xfeMenuHelp, 	CASCADEBUTTON, XFE_Frame::help_menu_spec },
 	{ NULL }
 };