diff --git a/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp
index fb0c80a82b8..ada1ed938e3 100644
--- a/mozilla/content/base/src/nsContentUtils.cpp
+++ b/mozilla/content/base/src/nsContentUtils.cpp
@@ -1832,7 +1832,9 @@ nsContentUtils::CanLoadImage(nsIURI* aURI, nsISupports* aContext,
                                 nsIScriptSecurityManager::ALLOW_CHROME);
     if (NS_FAILED(rv)) {
       if (aImageBlockingStatus) {
-        *aImageBlockingStatus = nsIContentPolicy::REJECT_SERVER;
+        // Reject the request itself, not all requests to the relevant
+        // server...
+        *aImageBlockingStatus = nsIContentPolicy::REJECT_REQUEST;
       }
       return PR_FALSE;
     }
diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index ede5666df4b..28bd5fcf691 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -450,9 +450,8 @@ nsresult
 nsImageFrame::HandleLoadError(PRInt16 aImageStatus)
 {
   if (!NS_CP_ACCEPTED(aImageStatus) &&
-      aImageStatus != nsIContentPolicy::REJECT_TYPE) {
-    // The image is blocked, but not because all images are blocked.
-    // don't display any alt feedback in this case; we're blocking images
+      aImageStatus == nsIContentPolicy::REJECT_SERVER) {
+    // Don't display any alt feedback in this case; we're blocking images
     // from that site and don't care to see anything from them
     return NS_OK;
   }
@@ -1348,7 +1347,7 @@ nsImageFrame::Paint(nsPresContext*      aPresContext,
       
         if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer &&
             (NS_CP_ACCEPTED(imageStatus) ||
-             imageStatus == nsIContentPolicy::REJECT_TYPE)) {
+             imageStatus != nsIContentPolicy::REJECT_SERVER)) {
           DisplayAltFeedback(aPresContext, aRenderingContext, 
                              (loadStatus & imgIRequest::STATUS_ERROR)
                              ? gIconLoad->mBrokenImage