diff --git a/browser/components/prefwindow/content/pref-extensions.js b/browser/components/prefwindow/content/pref-extensions.js
index fb24aaebe061..d9e128b7cf61 100644
--- a/browser/components/prefwindow/content/pref-extensions.js
+++ b/browser/components/prefwindow/content/pref-extensions.js
@@ -128,19 +128,3 @@ function showSettings()
     window.openDialog(selectedItem.getAttribute("settingsURL"), "", "chrome,dialog,modal");
 }
 
-function visitLink (aEvent, aAuthor)
-{
-  var msg = "";
-  if (aAuthor)
-    msg = "prefCloseThemeAuthorLinkMsg";
-  else
-    msg = "prefCloseThemeNewExtensionLinkMsg";
-
-  var node = aEvent.target;
-  while (node.nodeType != Node.ELEMENT_NODE)
-    node = node.parentNode;
-
-  var url = node.getAttribute("link");
-  if (url != "")
-    parent.visitLink("prefCloseThemeLinkTitle", msg, url);
-}
diff --git a/browser/components/prefwindow/content/pref-extensions.xul b/browser/components/prefwindow/content/pref-extensions.xul
index 0cffccd0deb3..9803cd6dac83 100644
--- a/browser/components/prefwindow/content/pref-extensions.xul
+++ b/browser/components/prefwindow/content/pref-extensions.xul
@@ -47,9 +47,6 @@
 
   <script type="application/x-javascript" src="chrome://browser/content/pref/pref-extensions.js"/>
 
-  <stringbundle id="bundle_prefutilities"
-                src="chrome://browser/locale/pref/prefutilities.properties"/>
-      
   <vbox flex="1">
     <label value="&extensionTitle.label;"/>
     
@@ -75,13 +72,13 @@
     <vbox flex="1" class="inset extensionInfoArea" style="overflow:auto;">
       <label class="header" id="extDisplayName" value=""/>
       <hbox pack="start">
-        <label id="extAuthor" tooltip="&author.tooltip;" onclick="visitLink(event, true);"/>
+        <label id="extAuthor" tooltip="&author.tooltip;" onclick="parent.visitLink(event);"/>
       </hbox>
       <description id="extDescription" flex="1"/>
     </vbox>
     <separator/>
     <hbox align="center">
-      <html:a class="themesLink" link="http://texturizer.net/phoenix/extensions.html" onclick="visitLink(event, false);"
+      <html:a class="themesLink" link="http://texturizer.net/phoenix/extensions.html" onclick="parent.visitLink(event);"
           style="padding-left:4px; display: block;" tooltip="&getnew.tooltip;">&getNewExtensions.label;</html:a>
       <spacer flex="1"/>
       <button disabled="true" id="extensionSettings" label="&extensionSettings.label;" oncommand="showSettings();"/>
diff --git a/browser/components/prefwindow/content/pref-privacy.js b/browser/components/prefwindow/content/pref-privacy.js
index 9f1ab40c8943..a1b696425c33 100644
--- a/browser/components/prefwindow/content/pref-privacy.js
+++ b/browser/components/prefwindow/content/pref-privacy.js
@@ -62,8 +62,14 @@ function Startup() {
   document.getElementById("passwords").setAttribute("cleardisabled", !e.hasMoreElements());
 
   // Initially disable the downloads clear button if there the downloads list is empty
-  e = PrivacyPanel.getDownloads();
-  document.getElementById("downloads").setAttribute("cleardisabled", !e.hasMoreElements());
+  try {
+    e = PrivacyPanel.getDownloads();
+    var hasDownloads = e.hasMoreElements();
+  }
+  catch (e) {
+    hasDownloads = false;
+  }
+  document.getElementById("downloads").setAttribute("cleardisabled", !hasDownloads);
   
   // Initially disable the form history clear button if the history is empty
   var formHistory = Components.classes["@mozilla.org/satchel/form-history;1"]
@@ -188,7 +194,12 @@ var PrivacyPanel = {
     downloads: function ()
     {
       var dlMgr = Components.classes["@mozilla.org/download-manager;1"].getService(Components.interfaces.nsIDownloadManager);
-      var downloads = PrivacyPanel.getDownloads();
+      try {
+        var downloads = PrivacyPanel.getDownloads();
+      }
+      catch (e) {
+        return true;
+      }
 
       var rdfs = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
       var state = rdfs.GetResource("http://home.netscape.com/NC-rdf#DownloadState");
diff --git a/browser/components/prefwindow/content/pref-themes.js b/browser/components/prefwindow/content/pref-themes.js
index a38adf6a1c22..d02f7fabaab1 100644
--- a/browser/components/prefwindow/content/pref-themes.js
+++ b/browser/components/prefwindow/content/pref-themes.js
@@ -272,20 +272,3 @@ function themeSelect()
     gData.name = null;
   }
 }
-
-function visitLink (aEvent, aAuthor)
-{
-  var msg = "";
-  if (aAuthor)
-    msg = "prefCloseThemeAuthorLinkMsg";
-  else
-    msg = "prefCloseThemeNewThemeLinkMsg";
-
-  var node = aEvent.target;
-  while (node.nodeType != Node.ELEMENT_NODE)
-    node = node.parentNode;
-
-  var url = node.getAttribute("link");
-  if (url != "")
-    parent.visitLink("prefCloseThemeLinkTitle", msg, url);
-}
diff --git a/browser/components/prefwindow/content/pref-themes.xul b/browser/components/prefwindow/content/pref-themes.xul
index 7b16a9c2dffa..b24ca4a41d06 100644
--- a/browser/components/prefwindow/content/pref-themes.xul
+++ b/browser/components/prefwindow/content/pref-themes.xul
@@ -88,7 +88,7 @@
     <vbox class="inset extensionInfoArea" style="overflow: auto;">
       <label class="header" id="displayName" value=""/>
       <hbox pack="start">
-        <label id="author" onclick="visitLink(event, true);" tooltip="&author.tooltip;"/>
+        <label id="author" onclick="parent.visitLink(event);" tooltip="&author.tooltip;"/>
       </hbox>
 
       <description>
@@ -100,7 +100,7 @@
     
     <hbox align="center">
       <html:a class="themesLink" id="themesLink" link="http://texturizer.net/phoenix/themes.html"
-          style="padding-left:4px; display: block;" tooltip="&getnew.tooltip;" onclick="visitLink(event, false);">&getNewThemes.label;</html:a>
+          style="padding-left:4px; display: block;" tooltip="&getnew.tooltip;" onclick="parent.visitLink(event);">&getNewThemes.label;</html:a>
       <spacer flex="1"/>    
       <button id="uninstallSkin" label="&uninstallSkin.label;" oncommand="uninstallSkin();"/>
     </hbox>
diff --git a/browser/components/prefwindow/content/pref.xul b/browser/components/prefwindow/content/pref.xul
index ab043d798dae..3a8c6674b970 100644
--- a/browser/components/prefwindow/content/pref.xul
+++ b/browser/components/prefwindow/content/pref.xul
@@ -60,26 +60,18 @@
       hPrefWindow.switchPage(newURL, newTag);
   }    
 
-  function visitLink(aTitle, aMsg, aURL)
+  function visitLink(aEvent)
   {
-    var prefbundle = document.getElementById("bundle_prefutilities");
-    var title = prefbundle.getString(aTitle);
-    var msg = prefbundle.getString(aMsg);
-    
-    var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
-    var flags = promptService.BUTTON_TITLE_OK * promptService.BUTTON_POS_0;
-    flags += promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_1;
+    var node = aEvent.target;
+    while (node.nodeType != Node.ELEMENT_NODE)
+      node = node.parentNode;
 
-    rv = promptService.confirmEx(window, title, msg, flags, null, null, null, null, { value: 0 });
-    
-    if (rv == 0) {
-      window.opener.openNewWindowWith(aURL, null, false);
-      document.documentElement.acceptDialog();
-    }
+    var url = node.getAttribute("link");
+    if (url != "")
+      window.opener.openNewWindowWith(url, null, false);
   }
-  
+
   ]]>
-  
   </script>        
         
   <stringbundle id="bundle_prefutilities"
diff --git a/browser/components/prefwindow/locale/prefutilities.properties b/browser/components/prefwindow/locale/prefutilities.properties
index ed22a1808659..cd795776b7a7 100644
--- a/browser/components/prefwindow/locale/prefutilities.properties
+++ b/browser/components/prefwindow/locale/prefutilities.properties
@@ -26,9 +26,3 @@ prefRemoveAllRemoveButton=Clear All Information
 prefRemovePasswdsMsg=Remove all saved passwords?
 prefRemovePasswdsTitle=Remove All Passwords
 prefRemovePasswdsRemoveButton=Remove All Passwords
-
-prefCloseThemeLinkTitle=Visit Web Site
-prefCloseThemeAuthorLinkMsg=Options will now close (changes will be saved) and you will be taken to the author's web site in a new window.
-prefCloseThemeNewThemeLinkMsg=Options will now close (changes will be saved) and you will be taken to the PhoenixHelp Themes web site in a new window.
-prefCloseThemeNewExtensionLinkMsg=Options will now close (changes will be saved) and you will be taken to the PhoenixHelp Extensions web site in a new window.
-