diff --git a/mozilla/extensions/irc/xul/content/commands.js b/mozilla/extensions/irc/xul/content/commands.js
index 9bd08cf9387..a601ff7d0e7 100644
--- a/mozilla/extensions/irc/xul/content/commands.js
+++ b/mozilla/extensions/irc/xul/content/commands.js
@@ -1920,8 +1920,8 @@ function cmdGotoURL(e)
     if (e.url.search(/^x-cz-command:/i) == 0)
     {
         var ary = e.url.match(/^x-cz-command:(.*)$/i);
-        e.sourceObject.frame.contentWindow.location = "javascript:void(view.dispatch('" +
-                                                      decodeURI(ary[1]) + "'))";
+        e.sourceObject.frame.contentWindow.location.href = 
+            "javascript:void(view.dispatch('" + decodeURI(ary[1]) + "'))";
         return;
     }
 
diff --git a/mozilla/extensions/xmlterm/ui/content/XMLTermCommands.js b/mozilla/extensions/xmlterm/ui/content/XMLTermCommands.js
index 07c77b36f92..6f4e4c401f8 100644
--- a/mozilla/extensions/xmlterm/ui/content/XMLTermCommands.js
+++ b/mozilla/extensions/xmlterm/ui/content/XMLTermCommands.js
@@ -728,7 +728,7 @@ function AboutXMLTerm() {
 }
 
 function Redirect() {
-   window.location = window.redirectURL;
+   window.location.href = window.redirectURL;
 }
 
 
diff --git a/mozilla/extensions/xmlterm/ui/content/xmlterm2.html b/mozilla/extensions/xmlterm/ui/content/xmlterm2.html
index a46c3816433..2421b27e0f9 100644
--- a/mozilla/extensions/xmlterm/ui/content/xmlterm2.html
+++ b/mozilla/extensions/xmlterm/ui/content/xmlterm2.html
@@ -124,7 +124,7 @@
         if (window.xmltbrowser) {
            dump("Load:xmltbrowser.location.href="+window.xmltbrowser.location.href+"\n");
            if (window.xmltbrowser.location.href.length) {
-              window.xmltbrowser.location = url;
+              window.xmltbrowser.location.href = url;
               succeeded = true;
            }
         }
diff --git a/mozilla/mail/base/content/mailWindow.js b/mozilla/mail/base/content/mailWindow.js
index 70b53f76b6b..534ba0d9052 100644
--- a/mozilla/mail/base/content/mailWindow.js
+++ b/mozilla/mail/base/content/mailWindow.js
@@ -498,7 +498,7 @@ function loadStartPage()
       var startpage = pref.getComplexValue("mailnews.start_page.url", Components.interfaces.nsIPrefLocalizedString).data;
       if (startpage != "") 
       {
-        GetMessagePaneFrame().location = startpage;
+        GetMessagePaneFrame().location.href = startpage;
         //dump("start message pane with: " + startpage + "\n");
         ClearMessageSelection();
       }
@@ -533,7 +533,7 @@ function ShowingAccountCentral()
         document.getElementById("threadpane-splitter").collapsed = true;
         gSearchBox.collapsed = true;
 
-        window.frames["accountCentralPane"].location = acctCentralPage;
+        window.frames["accountCentralPane"].location.href = acctCentralPage;
         
         if (!IsFolderPaneCollapsed())
             GetFolderTree().focus();        
@@ -550,7 +550,7 @@ function HidingAccountCentral()
 {
     try
     {
-        window.frames["accountCentralPane"].location = "about:blank";
+        window.frames["accountCentralPane"].location.href = "about:blank";
     }
     catch (ex)
     {
diff --git a/mozilla/mail/base/content/msgMail3PaneWindow.js b/mozilla/mail/base/content/msgMail3PaneWindow.js
index b3f2dc9de18..2557c7852d8 100644
--- a/mozilla/mail/base/content/msgMail3PaneWindow.js
+++ b/mozilla/mail/base/content/msgMail3PaneWindow.js
@@ -1264,8 +1264,8 @@ function ClearMessagePane()
   {
     gHaveLoadedMessage = false;
     gCurrentDisplayedMessage = null;
-    if (GetMessagePaneFrame().location != "about:blank")
-        GetMessagePaneFrame().location = "about:blank";
+    if (GetMessagePaneFrame().location.href != "about:blank")
+        GetMessagePaneFrame().location.href = "about:blank";
     
     // hide the message header view AND the message pane...
     HideMessageHeaderPane();
diff --git a/mozilla/mailnews/base/resources/content/mailWindow.js b/mozilla/mailnews/base/resources/content/mailWindow.js
index 89d594642bc..d05487fe8b7 100644
--- a/mozilla/mailnews/base/resources/content/mailWindow.js
+++ b/mozilla/mailnews/base/resources/content/mailWindow.js
@@ -537,7 +537,7 @@ function loadStartPage() {
                 // first, clear out the charset setting.
                 messenger.setDisplayCharset("");
 
-                GetMessagePaneFrame().location = startpage;
+                GetMessagePaneFrame().location.href = startpage;
                 //dump("start message pane with: " + startpage + "\n");
                 ClearMessageSelection();
             }
@@ -566,7 +566,7 @@ function ShowAccountCentral()
         gSearchBox.collapsed = true;
         GetThreadTree().collapsed = true;
         document.getElementById("accountCentralBox").collapsed = false;
-        window.frames["accountCentralPane"].location = acctCentralPage;
+        window.frames["accountCentralPane"].location.href = acctCentralPage;
         if (!IsFolderPaneCollapsed())
             GetFolderTree().focus();
         gAccountCentralLoaded = true;
@@ -585,7 +585,7 @@ function HideAccountCentral()
 {
     try
     {
-        window.frames["accountCentralPane"].location = "about:blank";
+        window.frames["accountCentralPane"].location.href = "about:blank";
         document.getElementById("accountCentralBox").collapsed = true;
         GetThreadTree().collapsed = false;
         gSearchBox.collapsed = false;
diff --git a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
index 82fa05b92bf..89b9b6c22fc 100644
--- a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -1131,8 +1131,8 @@ function ClearMessagePane()
   {
     gHaveLoadedMessage = false;
     gCurrentDisplayedMessage = null;
-    if (GetMessagePaneFrame().location != "about:blank")
-        GetMessagePaneFrame().location = "about:blank";
+    if (GetMessagePaneFrame().location.href != "about:blank")
+        GetMessagePaneFrame().location.href = "about:blank";
     // hide the message header view AND the message pane...
     HideMessageHeaderPane();
 
diff --git a/mozilla/mailnews/base/resources/content/msgPrintEngine.js b/mozilla/mailnews/base/resources/content/msgPrintEngine.js
index df2c1b845e8..2873b89b006 100644
--- a/mozilla/mailnews/base/resources/content/msgPrintEngine.js
+++ b/mozilla/mailnews/base/resources/content/msgPrintEngine.js
@@ -287,8 +287,8 @@ function InitPrintEngineWindow()
 
 function ClearPrintEnginePane()
 {
-  if (window.frames["content"].location != "about:blank")
-      window.frames["content"].location = "about:blank";
+  if (window.frames["content"].location.href != "about:blank")
+      window.frames["content"].location.href = "about:blank";
 }
 
 function StopUrls()
diff --git a/mozilla/xpfe/components/search/resources/internetresults.js b/mozilla/xpfe/components/search/resources/internetresults.js
index dbe266ac52f..6b6980164fb 100644
--- a/mozilla/xpfe/components/search/resources/internetresults.js
+++ b/mozilla/xpfe/components/search/resources/internetresults.js
@@ -182,7 +182,8 @@ function doEngineClick( event, aNode )
     }
   }
   else
-    frames[0].document.location = "chrome://communicator/locale/search/default.htm";
+    frames[0].document.location.href = 
+      "chrome://communicator/locale/search/default.htm";
 }