diff --git a/mozilla/browser/components/feeds/src/FeedWriter.js b/mozilla/browser/components/feeds/src/FeedWriter.js
index 837b1da78d3..5a513d3e7a4 100755
--- a/mozilla/browser/components/feeds/src/FeedWriter.js
+++ b/mozilla/browser/components/feeds/src/FeedWriter.js
@@ -715,7 +715,7 @@ FeedWriter.prototype = {
         // For privacy reasons we cannot set the image attribute directly
         // to the icon url, see Bug 358878
         var uri = makeURI(handlers[i].uri);
-        if (uri) 
+        if (uri && /^https?/.test(uri.scheme))
           new iconDataURIGenerator(uri.prePath + "/favicon.ico", menuItem)
       }
     }
diff --git a/mozilla/browser/components/preferences/feeds.js b/mozilla/browser/components/preferences/feeds.js
index a95761a7809..53ec47b80e7 100644
--- a/mozilla/browser/components/preferences/feeds.js
+++ b/mozilla/browser/components/preferences/feeds.js
@@ -187,8 +187,9 @@ var gFeedsPane = {
       row.setAttribute("webhandlerurl", handlers[i].uri);
 
       var uri = ios.newURI(handlers[i].uri, null, null);
-      row.setAttribute("image", uri.prePath + "/favicon.ico");
-      
+      if (/^https?/.test(uri.scheme))
+        row.setAttribute("image", uri.prePath + "/favicon.ico");
+
       readersList.appendChild(row);
     }
   },