diff --git a/mozilla/extensions/cookie/resources/content/pref-cookies.xul b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
index 295a251c1a9..481cea098d6 100644
--- a/mozilla/extensions/cookie/resources/content/pref-cookies.xul
+++ b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
@@ -89,15 +89,15 @@
     var cookieLifetime = document.getElementById("networkCookieLifetime");
     var lifetimeDays = document.getElementById("lifetimeDays");
     var alwaysAcceptSession = document.getElementById("alwaysAcceptSession");
-    if (cookieLifetime.value == ask_before_accepting) {
-      lifetimeDays.disabled = true;
-      alwaysAcceptSession.disabled = false;
-    } else if (cookieLifetime.value == accept_for_n_days) {
-      lifetimeDays.disabled = false;
-      alwaysAcceptSession.disabled = true;      
-    } else {
+
+    if (cookieBehavior.value == cookies_disabled) {
+      cookieLifetime.disabled = true;
       lifetimeDays.disabled = true;
       alwaysAcceptSession.disabled = true;
+    } else {
+      cookieLifetime.disabled = false
+      lifetimeDays.disabled = (cookieLifetime.value != accept_for_n_days);
+      alwaysAcceptSession.disabled = (cookieLifetime.value != ask_before_accepting);
     }
 
     if (parent.hPrefWindow.getPrefIsLocked(alwaysAcceptSession.getAttribute("prefstring")) )
@@ -105,7 +105,10 @@
       
     if (parent.hPrefWindow.getPrefIsLocked(lifetimeDays.getAttribute("prefstring")) )
       lifetimeDays.disabled = true;
-    
+
+    if (parent.hPrefWindow.getPrefIsLocked(cookieLifetime.getAttribute("prefstring")) )
+      cookieLifetime.disabled = true;
+
     if (!lifetimeDays.disabled && setFocus)
       lifetimeDays.focus();
   }
@@ -132,7 +135,7 @@
     </radiogroup>
   </groupbox>
   <groupbox id="networkCookieLifetimePolicy">
-    <caption label="&cookieLifetimePolicy.label;"/>
+    <caption label="&cookieRetentionPolicy.label;"/>
     <radiogroup id="networkCookieLifetime"
                 prefstring="network.cookie.lifetimePolicy">
       <radio value="0" label="&acceptNormally.label;" accesskey="&acceptNormally.accesskey;" oncommand="setDisables(false);"/>
@@ -142,7 +145,7 @@
                oncommand="setDisables(true);"/>
         <textbox id="lifetimeDays" pref="true" size="4"
                  preftype="int" prefstring="network.cookie.lifetime.days"/>
-        <label value="&days.label;" for="lifetimeDays"/>
+        <label value="&days.label;" control="lifetimeDays"/>
       </hbox>
       <hbox>
         <radio value="1" label="&warnAboutCookies.label;" 
diff --git a/mozilla/extensions/cookie/resources/locale/en-US/pref-cookies.dtd b/mozilla/extensions/cookie/resources/locale/en-US/pref-cookies.dtd
index 304f907e23f..647b22dfecf 100644
--- a/mozilla/extensions/cookie/resources/locale/en-US/pref-cookies.dtd
+++ b/mozilla/extensions/cookie/resources/locale/en-US/pref-cookies.dtd
@@ -16,7 +16,7 @@
 <!ENTITY disableCookies.label           "Block cookies">
 <!ENTITY disableCookies.accesskey       "B">
 
-<!ENTITY cookieLifetimePolicy.label     "Cookie Lifetime Policy">
+<!ENTITY cookieRetentionPolicy.label    "Cookie Retention Policy">
 
 <!ENTITY acceptNormally.label           "Accept cookies normally">
 <!ENTITY acceptNormally.accesskey       "n">
@@ -38,6 +38,6 @@
 
 <!ENTITY viewCookies.label              "Cookie Manager">
 <!ENTITY viewCookies.accesskey          "M">
-<!ENTITY viewP3P.label                  "View">
+<!ENTITY viewP3P.label                  "View Privacy Settings">
 <!ENTITY viewP3P.accesskey              "V">