diff --git a/mozilla/mail/extensions/newsblog/content/FeedItem.js b/mozilla/mail/extensions/newsblog/content/FeedItem.js
index b6929c41ca1..6558750b7f8 100755
--- a/mozilla/mail/extensions/newsblog/content/FeedItem.js
+++ b/mozilla/mail/extensions/newsblog/content/FeedItem.js
@@ -303,6 +303,12 @@ FeedItem.prototype.writeToFolder = function() {
   if (this.author && this.author.indexOf('@') == -1)
     this.author = '<' + this.author + '>';
 
+  // the subject may contain HTML entities.
+  // Convert these to their unencoded state. i.e. &amp; becomes '&'
+  this.title = this.title.replace(/&lt;/g, '<');
+  this.title = this.title.replace(/&gt;/g, '>');
+  this.title = this.title.replace(/&amp;/g, '&');
+  
   // Compress white space in the subject to make it look better.
   this.title = this.title.replace(/[\t\r\n]+/g, " ");
   this.title = this.mimeEncodeSubject(this.title, this.characterSet);
diff --git a/mozilla/mail/extensions/newsblog/content/utils.js b/mozilla/mail/extensions/newsblog/content/utils.js
index 15c79b950fe..d4eaa98fab5 100755
--- a/mozilla/mail/extensions/newsblog/content/utils.js
+++ b/mozilla/mail/extensions/newsblog/content/utils.js
@@ -1,7 +1,7 @@
 // XXX Rename this to global.js
 
 // Whether or not to dump debugging messages to the console.
-const DEBUG = true;
+const DEBUG = false;
 var debug;
 if (DEBUG)
   debug = function(msg) { dump(' -- FZ -- : ' + msg + '\n'); }