diff --git a/mozilla/suite/browser/navigator.js b/mozilla/suite/browser/navigator.js
index 9a339c44847..8d28ce39aab 100644
--- a/mozilla/suite/browser/navigator.js
+++ b/mozilla/suite/browser/navigator.js
@@ -1337,3 +1337,23 @@ function dumpMemoryLeaks() {
 	if (leakDetector != null)
 		leakDetector.dumpLeaks();
 }
+
+function enableUriLoading() {
+	var pref = Components.classes['component://netscape/preferences'];
+     if (pref)
+     {
+     	pref = pref.getService();   	
+     	pref = pref.QueryInterface(Components.interfaces.nsIPref);
+		pref.SetDefaultBoolPref("browser.uriloader", true);
+	 }
+}
+
+function disableUriLoading() {
+	var pref = Components.classes['component://netscape/preferences'];
+     if (pref)
+     {
+     	pref = pref.getService();   	
+     	pref = pref.QueryInterface(Components.interfaces.nsIPref);
+		pref.SetDefaultBoolPref("browser.uriloader", false);
+	 }
+}
\ No newline at end of file
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 2a7307bf98d..31a8c459f51 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -508,7 +508,15 @@ Contributor(s): ______________________________________. -->
      <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')"/>
-     </menupopup>
+    
+     <menuseparator />
+	   <menu value="&URIDispatchingCmd.label;">
+		  <menupopup>
+			 <menuitem value="&URIDispatchingEnableCmd.label;" oncommand="enableUriLoading();"/>
+			 <menuitem value="&URIDispatchingDisableCmd.label;" oncommand="disableUriLoading();"/>
+	    </menupopup>
+     </menu>
+    </menupopup>
   </menu>
 
   <menu accesskey="q" value="&QA.label;">
diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index 9a339c44847..8d28ce39aab 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -1337,3 +1337,23 @@ function dumpMemoryLeaks() {
 	if (leakDetector != null)
 		leakDetector.dumpLeaks();
 }
+
+function enableUriLoading() {
+	var pref = Components.classes['component://netscape/preferences'];
+     if (pref)
+     {
+     	pref = pref.getService();   	
+     	pref = pref.QueryInterface(Components.interfaces.nsIPref);
+		pref.SetDefaultBoolPref("browser.uriloader", true);
+	 }
+}
+
+function disableUriLoading() {
+	var pref = Components.classes['component://netscape/preferences'];
+     if (pref)
+     {
+     	pref = pref.getService();   	
+     	pref = pref.QueryInterface(Components.interfaces.nsIPref);
+		pref.SetDefaultBoolPref("browser.uriloader", false);
+	 }
+}
\ No newline at end of file
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index 2a7307bf98d..31a8c459f51 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -508,7 +508,15 @@ Contributor(s): ______________________________________. -->
      <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')"/>
-     </menupopup>
+    
+     <menuseparator />
+	   <menu value="&URIDispatchingCmd.label;">
+		  <menupopup>
+			 <menuitem value="&URIDispatchingEnableCmd.label;" oncommand="enableUriLoading();"/>
+			 <menuitem value="&URIDispatchingDisableCmd.label;" oncommand="disableUriLoading();"/>
+	    </menupopup>
+     </menu>
+    </menupopup>
   </menu>
 
   <menu accesskey="q" value="&QA.label;">