diff --git a/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js b/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js
index 8512361ff47..3f66bed610a 100644
--- a/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js
+++ b/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js
@@ -621,7 +621,7 @@ var gFeedSubscriptionsWindow = {
   storeFeed: function(feedProperties)
   {
     var itemResource = rdf.GetResource(feedProperties.feedLocation);
-    feed = new Feed(itemResource, this.mRSSServer);
+    var feed = new Feed(itemResource, this.mRSSServer);
 
     // if the user specified a specific folder to add the feed too, then set it here
     if (feedProperties.folderURI)
diff --git a/mozilla/mail/locales/en-US/chrome/messenger/FilterEditor.dtd b/mozilla/mail/locales/en-US/chrome/messenger/FilterEditor.dtd
index 9e4a0ef0511..556e8e16183 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/FilterEditor.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/FilterEditor.dtd
@@ -1,20 +1,5 @@
 <!ENTITY window.title "Filter Rules">
-<!ENTITY subject.label "subject">
-<!ENTITY sender.label "sender">
-<!ENTITY date.label "date">
-<!ENTITY anyText.label "any text">
-<!ENTITY keyword.label "keyword">
-<!ENTITY age.label "age in days">
-<!ENTITY to.label "to">
 
-<!-- LOCALIZATION NOTE (cc.label): DONT_TRANSLATE -->
-<!ENTITY cc.label "Cc">
-
-<!ENTITY status.label "status">
-<!ENTITY priority.label "priority">
-<!ENTITY body.label "body">
-<!ENTITY contains.label "contains">
-<!ENTITY nocontains.label "doesn't contain">
 <!ENTITY filterName.label "Filter name:">
 <!ENTITY filterName.accesskey "i">
 
@@ -41,7 +26,6 @@
 <!ENTITY replyWithTemplate.label "Reply with Template">
 <!ENTITY markMessageRead.label "Mark As Read">
 <!ENTITY markMessageStarred.label "Add Star">
-<!ENTITY labelMessage.label "Label Message As">
 <!ENTITY setPriority.label "Set Priority to">
 <!ENTITY addTag.label "Tag Message">
 <!ENTITY setJunkScore.label "Set Junk Status to">
diff --git a/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd b/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd
index cca46b138b3..930f1129878 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -619,10 +619,6 @@
 <!ENTITY contextPrintPreview.accesskey "v">
 <!ENTITY contextDelete.label "Delete">
 <!ENTITY contextDelete.accesskey "D">
-<!ENTITY contextAddSenderToAddressBook.label "Add Sender To Address Book">
-<!ENTITY contextAddSenderToAddressBook.accesskey "B">
-<!ENTITY contextAddAllToAddressBook.label "Add All To Address Book">
-<!ENTITY contextAddAllToAddressBook.accesskey "A">
 
 <!-- Junk Bar -->
 <!ENTITY junkBarMessage1.label "Junk Mail">
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd
index 7e01276af56..cfda12ed769 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd
@@ -53,23 +53,7 @@
  ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY window.title "Filter Rules">
-<!ENTITY subject.label "subject">
-<!ENTITY sender.label "sender">
-<!ENTITY date.label "date">
-<!ENTITY anyText.label "any text">
-<!ENTITY keyword.label "keyword">
-<!ENTITY age.label "age in days">
-<!ENTITY to.label "to">
-<!ENTITY size.label "size">
 
-<!-- LOCALIZATION NOTE (cc.label): DONT_TRANSLATE -->
-<!ENTITY cc.label "Cc">
-
-<!ENTITY status.label "status">
-<!ENTITY priority.label "priority">
-<!ENTITY body.label "body">
-<!ENTITY contains.label "contains">
-<!ENTITY nocontains.label "doesn't contain">
 <!ENTITY filterName.label "Filter name:">
 <!ENTITY filterName.accesskey "i">
 
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
index 0f5ee066609..81882191f07 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -529,10 +529,6 @@
 <!ENTITY contextPrint.accesskey "P">
 <!ENTITY contextPrintPreview.label "Print Preview">
 <!ENTITY contextPrintPreview.accesskey "v">
-<!ENTITY contextAddSenderToAddressBook.label "Add Sender To Address Book">
-<!ENTITY contextAddSenderToAddressBook.accesskey "B">
-<!ENTITY contextAddAllToAddressBook.label "Add All To Address Book">
-<!ENTITY contextAddAllToAddressBook.accesskey "A">
 
 <!-- Folder Pane Context Menu -->
 <!ENTITY folderContextGetMessages.label "Get Messages for Account">