diff --git a/mozilla/include/allxpstr.h b/mozilla/include/allxpstr.h
index 8c21cd8962e..390a399e574 100644
--- a/mozilla/include/allxpstr.h
+++ b/mozilla/include/allxpstr.h
@@ -7936,7 +7936,7 @@ ResDef(MK_LDAP_AUTHDN_LOOKUP_FAILED, XP_MSG_BASE + 1469, "Mail id invalid or not
 
 /* Cookies & Signons XP Strings */
 ResDef(MK_ACCESS_COOKIES_WISHES_MODIFY, (XP_MSG_BASE + 1476),
-"The server %1$s \nwishes to modify an existing cookie.\n\n\
+"The site %1$s \nwishes to modify an existing cookie.\n\n\
 Do you wish to allow the cookie to be modified?")
 
 ResDef(MK_ACCESS_SITE_COOKIES_ACCEPTED, (XP_MSG_BASE + 1477),
@@ -7949,17 +7949,17 @@ ResDef(MK_SIGNON_VIEW_REJECTS, (XP_MSG_BASE + 1479),
 "View sign-ons that won't be saved")
 
 ResDef(MK_ACCESS_COOKIES_WISHES0, (XP_MSG_BASE + 1480),
-"The server %1$s \nwishes to set a cookie.\n\n\
+"The site %1$s \nwishes to set a cookie.\n\n\
 Do you wish to allow the cookie to be set?")
 
 ResDef(MK_ACCESS_COOKIES_WISHES1, (XP_MSG_BASE + 1481),
-"The server %1$s \nwishes to set another cookie.\n\
-You currently have a cookie from this server.\n\n\
+"The site %1$s \nwishes to set another cookie.\n\
+You currently have a cookie from this site.\n\n\
 Do you wish to allow the cookie to be set?")
 
 ResDef(MK_ACCESS_COOKIES_WISHESN, (XP_MSG_BASE + 1482),
-"The server %1$s \nwishes to set another cookie.\n\
-You currently have %2$d cookies from this server.\n\n\
+"The site %1$s \nwishes to set another cookie.\n\
+You currently have %2$d cookies from this site.\n\n\
 Do you wish to allow the cookie to be set?")
 
 ResDef(MK_ACCESS_COOKIES_REMEMBER, (XP_MSG_BASE + 1483),
diff --git a/mozilla/include/allxpstr.rc b/mozilla/include/allxpstr.rc
index 8c21cd8962e..390a399e574 100644
--- a/mozilla/include/allxpstr.rc
+++ b/mozilla/include/allxpstr.rc
@@ -7936,7 +7936,7 @@ ResDef(MK_LDAP_AUTHDN_LOOKUP_FAILED, XP_MSG_BASE + 1469, "Mail id invalid or not
 
 /* Cookies & Signons XP Strings */
 ResDef(MK_ACCESS_COOKIES_WISHES_MODIFY, (XP_MSG_BASE + 1476),
-"The server %1$s \nwishes to modify an existing cookie.\n\n\
+"The site %1$s \nwishes to modify an existing cookie.\n\n\
 Do you wish to allow the cookie to be modified?")
 
 ResDef(MK_ACCESS_SITE_COOKIES_ACCEPTED, (XP_MSG_BASE + 1477),
@@ -7949,17 +7949,17 @@ ResDef(MK_SIGNON_VIEW_REJECTS, (XP_MSG_BASE + 1479),
 "View sign-ons that won't be saved")
 
 ResDef(MK_ACCESS_COOKIES_WISHES0, (XP_MSG_BASE + 1480),
-"The server %1$s \nwishes to set a cookie.\n\n\
+"The site %1$s \nwishes to set a cookie.\n\n\
 Do you wish to allow the cookie to be set?")
 
 ResDef(MK_ACCESS_COOKIES_WISHES1, (XP_MSG_BASE + 1481),
-"The server %1$s \nwishes to set another cookie.\n\
-You currently have a cookie from this server.\n\n\
+"The site %1$s \nwishes to set another cookie.\n\
+You currently have a cookie from this site.\n\n\
 Do you wish to allow the cookie to be set?")
 
 ResDef(MK_ACCESS_COOKIES_WISHESN, (XP_MSG_BASE + 1482),
-"The server %1$s \nwishes to set another cookie.\n\
-You currently have %2$d cookies from this server.\n\n\
+"The site %1$s \nwishes to set another cookie.\n\
+You currently have %2$d cookies from this site.\n\n\
 Do you wish to allow the cookie to be set?")
 
 ResDef(MK_ACCESS_COOKIES_REMEMBER, (XP_MSG_BASE + 1483),
diff --git a/mozilla/network/protocol/http/mkaccess.c b/mozilla/network/protocol/http/mkaccess.c
index 8b0a623f3f3..f8d16dea91c 100644
--- a/mozilla/network/protocol/http/mkaccess.c
+++ b/mozilla/network/protocol/http/mkaccess.c
@@ -2247,7 +2247,6 @@ net_IntSetCookieString(MWContext * context,
 		 * the choice to accept it or not
 		 */
 		char * new_string=0;
-		char * tmp_host = NET_ParseURL(cur_url, GET_HOST_PART);
 #if defined(CookieManagement)
 		int count;
 		char * remember_string = 0;
@@ -2263,31 +2262,26 @@ net_IntSetCookieString(MWContext * context,
 		if (prev_cookie) {
 		    new_string = PR_smprintf(
 			XP_GetString(MK_ACCESS_COOKIES_WISHES_MODIFY),
-			tmp_host ? tmp_host : "");
+			host_from_header ? host_from_header : "");
 		} else if (count>1) {
 		    new_string = PR_smprintf(
 			XP_GetString(MK_ACCESS_COOKIES_WISHESN),
-			tmp_host ? tmp_host : "",
+			host_from_header ? host_from_header : "",
 			count);
 		} else if (count==1){
 		    new_string = PR_smprintf(
 			XP_GetString(MK_ACCESS_COOKIES_WISHES1),
-			tmp_host ? tmp_host : "");
+			host_from_header ? host_from_header : "");
 		} else {
 		    new_string = PR_smprintf(
 			XP_GetString(MK_ACCESS_COOKIES_WISHES0),
-			tmp_host ? tmp_host : "");
+			host_from_header ? host_from_header : "");
 		}
-		PR_Free(tmp_host);
 #else
-        StrAllocCopy(new_string, XP_GetString(MK_ACCESS_COOKIES_THE_SERVER));
-        StrAllocCat(new_string, tmp_host ? tmp_host : "");
-        StrAllocCat(new_string, XP_GetString(MK_ACCESS_COOKIES_WISHES));
-
+		char * tmp_host = NET_ParseURL(cur_url, GET_HOST_PART);
 		StrAllocCopy(new_string, XP_GetString(MK_ACCESS_COOKIES_THE_SERVER));
 		StrAllocCat(new_string, tmp_host ? tmp_host : "");
 		StrAllocCat(new_string, XP_GetString(MK_ACCESS_COOKIES_WISHES));
-
 		PR_Free(tmp_host);
 
 		if(is_domain) {