diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.dtd b/mozilla/extensions/wallet/cookieviewer/CookieViewer.dtd
index 76f39475133..34ff9573825 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.dtd
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.dtd
@@ -1,8 +1,8 @@
 <!ENTITY     tab.cookiesonsystem.label      "Stored Cookies">
 <!ENTITY     tab.bannedservers.label        "Cookie Sites">
-<!ENTITY     div.bannedservers.label        "Select Internet websites that can and cannot store cookies on your computer.">
+<!ENTITY     div.bannedservers.label        "Internet websites that can and cannot store cookies on your computer.">
 <!ENTITY     tab.bannedimages.label         "Image Sites">
-<!ENTITY     div.bannedimages.label         "Select Internet websites from which images are or are not fetched.">
+<!ENTITY     div.bannedimages.label         "Internet websites from which images are or are not fetched.">
 <!ENTITY     div.cookiesonsystem.label      "View and Remove Cookies that are stored on your computer.">
 <!ENTITY     treehead.cookiename.label      "Cookie Name">
 <!ENTITY     treehead.cookiedomain.label    "Site"> 
diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
index c94620601cf..34b18e235a1 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
@@ -75,6 +75,20 @@ function Startup()
     pref = Components.classes['component://netscape/preferences'];
     pref = pref.getService();
     pref = pref.QueryInterface(Components.interfaces.nsIPref);
+    try {
+      if (pref.GetBoolPref("cookieviewer.cookieTab")) {
+        element = document.getElementById("cookiesTab");
+        element.setAttribute("selected","true" );
+        element = document.getElementById("panel");
+        element.setAttribute("index","0" );
+      } else {
+        element = document.getElementById("imagesTab");
+        element.setAttribute("selected","true" );
+        element = document.getElementById("panel");
+        element.setAttribute("index","2" );
+      }
+    } catch(e) {
+    }
     try {
       if (pref.GetBoolPref("imageblocker.enabled")) {
         var element;
diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
index 62584d2c32a..605babd1008 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
@@ -42,12 +42,12 @@
 
   <tabcontrol flex="100%" align="vertical">
     <tabbox>
-      <tab selected="true" value="&tab.cookiesonsystem.label;"/>
+      <tab id="cookiesTab" value="&tab.cookiesonsystem.label;"/>
       <tab value="&tab.bannedservers.label;"/>
       <tab id="imagesTab" style="display:none" value="&tab.bannedimages.label;"/>
 	  <spring flex="1"/>
     </tabbox>
-    <tabpanel align="horizontal" style="width: 400px;">
+    <tabpanel id="panel" align="horizontal" style="width: 400px;">
       <box class="tabpanel" id="system" flex="100%" align="vertical">
         <box><html:div>&div.cookiesonsystem.label;</html:div></box>
         <spring style="height: 10px;"/>
diff --git a/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.js b/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.js
index c94620601cf..34b18e235a1 100644
--- a/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.js
+++ b/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.js
@@ -75,6 +75,20 @@ function Startup()
     pref = Components.classes['component://netscape/preferences'];
     pref = pref.getService();
     pref = pref.QueryInterface(Components.interfaces.nsIPref);
+    try {
+      if (pref.GetBoolPref("cookieviewer.cookieTab")) {
+        element = document.getElementById("cookiesTab");
+        element.setAttribute("selected","true" );
+        element = document.getElementById("panel");
+        element.setAttribute("index","0" );
+      } else {
+        element = document.getElementById("imagesTab");
+        element.setAttribute("selected","true" );
+        element = document.getElementById("panel");
+        element.setAttribute("index","2" );
+      }
+    } catch(e) {
+    }
     try {
       if (pref.GetBoolPref("imageblocker.enabled")) {
         var element;
diff --git a/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul
index 62584d2c32a..605babd1008 100644
--- a/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul
+++ b/mozilla/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul
@@ -42,12 +42,12 @@
 
   <tabcontrol flex="100%" align="vertical">
     <tabbox>
-      <tab selected="true" value="&tab.cookiesonsystem.label;"/>
+      <tab id="cookiesTab" value="&tab.cookiesonsystem.label;"/>
       <tab value="&tab.bannedservers.label;"/>
       <tab id="imagesTab" style="display:none" value="&tab.bannedimages.label;"/>
 	  <spring flex="1"/>
     </tabbox>
-    <tabpanel align="horizontal" style="width: 400px;">
+    <tabpanel id="panel" align="horizontal" style="width: 400px;">
       <box class="tabpanel" id="system" flex="100%" align="vertical">
         <box><html:div>&div.cookiesonsystem.label;</html:div></box>
         <spring style="height: 10px;"/>
diff --git a/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.dtd b/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.dtd
index b7d2d40ca28..34ff9573825 100644
--- a/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.dtd
+++ b/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.dtd
@@ -1,11 +1,11 @@
 <!ENTITY     tab.cookiesonsystem.label      "Stored Cookies">
-<!ENTITY     tab.bannedservers.label        "Blocked Cookies">
-<!ENTITY     div.bannedservers.label        "Select Internet websites that can and cannot store Cookies on your computer.">
-<!ENTITY     tab.bannedimages.label         "Blocked Images">
-<!ENTITY     div.bannedimages.label         "Select Internet websites from which images are not fetched.">
+<!ENTITY     tab.bannedservers.label        "Cookie Sites">
+<!ENTITY     div.bannedservers.label        "Internet websites that can and cannot store cookies on your computer.">
+<!ENTITY     tab.bannedimages.label         "Image Sites">
+<!ENTITY     div.bannedimages.label         "Internet websites from which images are or are not fetched.">
 <!ENTITY     div.cookiesonsystem.label      "View and Remove Cookies that are stored on your computer.">
 <!ENTITY     treehead.cookiename.label      "Cookie Name">
-<!ENTITY     treehead.cookiedomain.label    "Cookie Domain"> 
+<!ENTITY     treehead.cookiedomain.label    "Site"> 
 <!ENTITY     treehead.infoselected.label    "Information about the selected Cookie">
 <!ENTITY     button.removecookie.label      "Remove Cookie">
 <!ENTITY     button.removeallcookies.label  "Remove All Cookies">
@@ -17,7 +17,7 @@
 <!ENTITY     props.secure.label             "Is Cookie secure?">
 <!ENTITY     props.expires.label            "Cookie will expire on:">
 
-<!ENTITY     treehead.sitename.label        "Domain Name">
+<!ENTITY     treehead.sitename.label        "Site">
 <!ENTITY     treehead.status.label          "Status">
 <!ENTITY     windowtitle.label              "Cookie Manager">
 
diff --git a/mozilla/xpfe/components/permissions/content/cookieViewer.js b/mozilla/xpfe/components/permissions/content/cookieViewer.js
index c94620601cf..34b18e235a1 100644
--- a/mozilla/xpfe/components/permissions/content/cookieViewer.js
+++ b/mozilla/xpfe/components/permissions/content/cookieViewer.js
@@ -75,6 +75,20 @@ function Startup()
     pref = Components.classes['component://netscape/preferences'];
     pref = pref.getService();
     pref = pref.QueryInterface(Components.interfaces.nsIPref);
+    try {
+      if (pref.GetBoolPref("cookieviewer.cookieTab")) {
+        element = document.getElementById("cookiesTab");
+        element.setAttribute("selected","true" );
+        element = document.getElementById("panel");
+        element.setAttribute("index","0" );
+      } else {
+        element = document.getElementById("imagesTab");
+        element.setAttribute("selected","true" );
+        element = document.getElementById("panel");
+        element.setAttribute("index","2" );
+      }
+    } catch(e) {
+    }
     try {
       if (pref.GetBoolPref("imageblocker.enabled")) {
         var element;
diff --git a/mozilla/xpfe/components/permissions/content/cookieViewer.xul b/mozilla/xpfe/components/permissions/content/cookieViewer.xul
index 62584d2c32a..605babd1008 100644
--- a/mozilla/xpfe/components/permissions/content/cookieViewer.xul
+++ b/mozilla/xpfe/components/permissions/content/cookieViewer.xul
@@ -42,12 +42,12 @@
 
   <tabcontrol flex="100%" align="vertical">
     <tabbox>
-      <tab selected="true" value="&tab.cookiesonsystem.label;"/>
+      <tab id="cookiesTab" value="&tab.cookiesonsystem.label;"/>
       <tab value="&tab.bannedservers.label;"/>
       <tab id="imagesTab" style="display:none" value="&tab.bannedimages.label;"/>
 	  <spring flex="1"/>
     </tabbox>
-    <tabpanel align="horizontal" style="width: 400px;">
+    <tabpanel id="panel" align="horizontal" style="width: 400px;">
       <box class="tabpanel" id="system" flex="100%" align="vertical">
         <box><html:div>&div.cookiesonsystem.label;</html:div></box>
         <spring style="height: 10px;"/>
diff --git a/mozilla/xpfe/components/permissions/locale/en-US/cookieViewer.dtd b/mozilla/xpfe/components/permissions/locale/en-US/cookieViewer.dtd
index b7d2d40ca28..34ff9573825 100644
--- a/mozilla/xpfe/components/permissions/locale/en-US/cookieViewer.dtd
+++ b/mozilla/xpfe/components/permissions/locale/en-US/cookieViewer.dtd
@@ -1,11 +1,11 @@
 <!ENTITY     tab.cookiesonsystem.label      "Stored Cookies">
-<!ENTITY     tab.bannedservers.label        "Blocked Cookies">
-<!ENTITY     div.bannedservers.label        "Select Internet websites that can and cannot store Cookies on your computer.">
-<!ENTITY     tab.bannedimages.label         "Blocked Images">
-<!ENTITY     div.bannedimages.label         "Select Internet websites from which images are not fetched.">
+<!ENTITY     tab.bannedservers.label        "Cookie Sites">
+<!ENTITY     div.bannedservers.label        "Internet websites that can and cannot store cookies on your computer.">
+<!ENTITY     tab.bannedimages.label         "Image Sites">
+<!ENTITY     div.bannedimages.label         "Internet websites from which images are or are not fetched.">
 <!ENTITY     div.cookiesonsystem.label      "View and Remove Cookies that are stored on your computer.">
 <!ENTITY     treehead.cookiename.label      "Cookie Name">
-<!ENTITY     treehead.cookiedomain.label    "Cookie Domain"> 
+<!ENTITY     treehead.cookiedomain.label    "Site"> 
 <!ENTITY     treehead.infoselected.label    "Information about the selected Cookie">
 <!ENTITY     button.removecookie.label      "Remove Cookie">
 <!ENTITY     button.removeallcookies.label  "Remove All Cookies">
@@ -17,7 +17,7 @@
 <!ENTITY     props.secure.label             "Is Cookie secure?">
 <!ENTITY     props.expires.label            "Cookie will expire on:">
 
-<!ENTITY     treehead.sitename.label        "Domain Name">
+<!ENTITY     treehead.sitename.label        "Site">
 <!ENTITY     treehead.status.label          "Status">
 <!ENTITY     windowtitle.label              "Cookie Manager">
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
index f6dd3f3991b..67afc521240 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
@@ -33,6 +33,18 @@
   <html:script language="JavaScript">
     function viewCookies() 
     {
+      pref = Components.classes['component://netscape/preferences'];
+      pref = pref.getService();
+      pref = pref.QueryInterface(Components.interfaces.nsIPref);
+      pref.SetBoolPref("cookieviewer.cookieTab", true);
+      window.openDialog("chrome://wallet/content/CookieViewer.xul","","modal=yes,chrome,resizable=no");
+    }
+    function viewImages() 
+    {
+      pref = Components.classes['component://netscape/preferences'];
+      pref = pref.getService();
+      pref = pref.QueryInterface(Components.interfaces.nsIPref);
+      pref.SetBoolPref("cookieviewer.cookieTab", false);
       window.openDialog("chrome://wallet/content/CookieViewer.xul","","modal=yes,chrome,resizable=no");
     }
   </html:script>
@@ -131,7 +143,7 @@
 
     <box align="horizontal" flex="1">
       <spring flex="1"/>
-      <titledbutton value="&viewImages.label;" class="dialog push" onclick="viewCookies();"/>
+      <titledbutton value="&viewImages.label;" class="dialog push" onclick="viewImages();"/>
     </box>
 	</titledbox>