diff --git a/mozilla/extensions/cookie/nsCookiePermission.cpp b/mozilla/extensions/cookie/nsCookiePermission.cpp
index 48e592a2545..dcffeae4ab6 100644
--- a/mozilla/extensions/cookie/nsCookiePermission.cpp
+++ b/mozilla/extensions/cookie/nsCookiePermission.cpp
@@ -111,7 +111,8 @@ nsCookiePermission::TestPermission(nsIURI *aURI,
 
       if (rememberDecision && mPermissionManager) {
         // Remember this decision
-        mPermissionManager->Add(aURI, nsIPermissionManager::COOKIE_TYPE, *aPermission);
+        mPermissionManager->Add(aURI, nsIPermissionManager::COOKIE_TYPE, 
+                                *aPermission ? nsIPermissionManager::ALLOW_ACTION : nsIPermissionManager::DENY_ACTION);
       }
     }
   } else {
diff --git a/mozilla/extensions/cookie/nsPermissionManager.cpp b/mozilla/extensions/cookie/nsPermissionManager.cpp
index e1b77682b31..07d7b648f2e 100644
--- a/mozilla/extensions/cookie/nsPermissionManager.cpp
+++ b/mozilla/extensions/cookie/nsPermissionManager.cpp
@@ -581,8 +581,8 @@ nsPermissionManager::Write()
    */
   static const char kTab[] = "\t";
   static const char kNew[] = "\n";
-  static const char kTrue[] = "F";
-  static const char kFalse[] = "T";
+  static const char kTrue[] = "T";
+  static const char kFalse[] = "F";
 
   PRInt32 hostCount = mPermissionList.Count();
   for (PRInt32 i = 0; i < hostCount; ++i) {
diff --git a/mozilla/extensions/cookie/resources/content/cookieAcceptDialog.js b/mozilla/extensions/cookie/resources/content/cookieAcceptDialog.js
index 565b296d654..a73a0455728 100644
--- a/mozilla/extensions/cookie/resources/content/cookieAcceptDialog.js
+++ b/mozilla/extensions/cookie/resources/content/cookieAcceptDialog.js
@@ -105,7 +105,7 @@ function onload()
 
       var messageText;
       if (cookie)
-        messageText = cookieBundle.getFormattedString(messageFormat,[cookie.host,cookiesFromHost]);
+        messageText = cookieBundle.getFormattedString(messageFormat,[hostname, cookiesFromHost]);
       else
         // No cookies means something went wrong. Bring up the dialog anyway
         // to not make the mess worse.
@@ -118,7 +118,7 @@ function onload()
       var headerNode = document.getElementById("dialog-header");
       headerNode.setAttribute("value",messageParagraphs[0]);
 
-      // use childnodes here, the tekst can wrap
+      // use childnodes here, the text can wrap
       for (var i = 1; i < messageParagraphs.length; i++) {
         var descriptionNode = document.createElement("description");
         text = document.createTextNode(messageParagraphs[i]);
diff --git a/mozilla/toolkit/components/cookie/content/cookieAcceptDialog.js b/mozilla/toolkit/components/cookie/content/cookieAcceptDialog.js
index 565b296d654..a73a0455728 100644
--- a/mozilla/toolkit/components/cookie/content/cookieAcceptDialog.js
+++ b/mozilla/toolkit/components/cookie/content/cookieAcceptDialog.js
@@ -105,7 +105,7 @@ function onload()
 
       var messageText;
       if (cookie)
-        messageText = cookieBundle.getFormattedString(messageFormat,[cookie.host,cookiesFromHost]);
+        messageText = cookieBundle.getFormattedString(messageFormat,[hostname, cookiesFromHost]);
       else
         // No cookies means something went wrong. Bring up the dialog anyway
         // to not make the mess worse.
@@ -118,7 +118,7 @@ function onload()
       var headerNode = document.getElementById("dialog-header");
       headerNode.setAttribute("value",messageParagraphs[0]);
 
-      // use childnodes here, the tekst can wrap
+      // use childnodes here, the text can wrap
       for (var i = 1; i < messageParagraphs.length; i++) {
         var descriptionNode = document.createElement("description");
         text = document.createTextNode(messageParagraphs[i]);