diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 8a39227b152..46d4905ea94 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -324,8 +324,7 @@ Rights Reserved.
     <menu id="threadPaneContext-moveMenu"
         label="&contextMoveMsgMenu.label;"
         accesskey="&contextMoveMsgMenu.accesskey;"
-        datasources="rdf:null"
-        ignore="http://home.netscape.com/NC-rdf#MessageChild">
+        datasources="rdf:null">
       <menupopup/>
       <template> 
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -391,8 +390,7 @@ Rights Reserved.
     <menu id="threadPaneContext-copyMenu"
       label="&contextCopyMsgMenu.label;"
       accesskey="&contextCopyMsgMenu.accesskey;"
-      datasources="rdf:null" 
-      ignore="http://home.netscape.com/NC-rdf#MessageChild">
+      datasources="rdf:null">
       <menupopup/>
       <template>
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -571,8 +569,7 @@ Rights Reserved.
     <menu id="messagePaneContext-moveMenu"
         label="&contextMoveMsgMenu.label;"
         accesskey="&contextMoveMsgMenu.accesskey;"
-        datasources="rdf:null"
-        ignore="http://home.netscape.com/NC-rdf#MessageChild">
+        datasources="rdf:null">
       <menupopup/>
       <template> 
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -638,8 +635,7 @@ Rights Reserved.
     <menu id="messagePaneContext-copyMenu"
       label="&contextCopyMsgMenu.label;"
       accesskey="&contextCopyMsgMenu.accesskey;"
-      datasources="rdf:null" 
-      ignore="http://home.netscape.com/NC-rdf#MessageChild">
+      datasources="rdf:null">
       <menupopup/>
       <template>
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -1046,8 +1042,7 @@ Rights Reserved.
             key="key_editAsNew"
             observes="cmd_editAsNew"/>
     <menuseparator/>
-    <menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null"
-     ignore="http://home.netscape.com/NC-rdf#MessageChild">
+    <menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null">
       <menupopup/>
       <template> 
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -1110,8 +1105,7 @@ Rights Reserved.
         </rule>
       </template>
     </menu>
-    <menu label="&copyMsgMenu.label;" accesskey="&copyMsgMenu.accesskey;" id="copyMenu" datasources="rdf:null"
-     ignore="http://home.netscape.com/NC-rdf#MessageChild">
+    <menu label="&copyMsgMenu.label;" accesskey="&copyMsgMenu.accesskey;" id="copyMenu" datasources="rdf:null">
       <menupopup/>
       <template>
       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
@@ -1236,7 +1230,7 @@ Rights Reserved.
       <button class="button-toolbar-2 top" id="button-replyall" label="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
       <button class="button-toolbar-2 top" id="button-forward" label="&forwardButton.label;" tooltip="aTooltip"  tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
       <toolbarseparator class="toolbarseparator-primary"/>
-      <menubutton class="button-toolbar-2 top" id="button-file" observes="button_file" datasources="rdf:null" ignore="http://home.netscape.com/NC-rdf#MessageChild" label="&fileButton.label;" tooltip="aTooltip" tooltiptext="&fileButton.tooltip;">
+      <menubutton class="button-toolbar-2 top" id="button-file" observes="button_file" datasources="rdf:null" label="&fileButton.label;" tooltip="aTooltip" tooltiptext="&fileButton.tooltip;">
         <template> 
         <rule nc:NoSelect="true" iscontainer="true" isempty="false">
           <menupopup>
diff --git a/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul b/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul
index c2601901478..238a3a0ff00 100644
--- a/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul
@@ -30,7 +30,7 @@ Rights Reserved.
   <script type="application/x-javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
 
-  <menu class="push" label="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ignore="http://home.netscape.com/NC-rdf#MessageChild"
+  <menu class="push" label="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
     ref="msgaccounts:/">
         <template>
           <rule nc:CanCreateSubfolders="true" nc:CanCreateFoldersOnServer="true" iscontainer="true" isempty="false">
@@ -82,7 +82,6 @@ Rights Reserved.
   <menulist label="&renamefolderclickhere.label;" uri=""
     id="msgRenameFolderPicker"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-    ignore="http://home.netscape.com/NC-rdf#MessageChild"
     ref="msgaccounts:/">
         <template>
           <rule nc:CanRename="true" iscontainer="true" isempty="false">
@@ -148,7 +147,6 @@ Rights Reserved.
 
   <menulist label="&choosefolderclickhere.label;" uri="" id="msgFccFolderPicker"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-    ignore="http://home.netscape.com/NC-rdf#MessageChild"
     ref="msgaccounts:/">
         <template>
           <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@@ -203,7 +201,6 @@ Rights Reserved.
   <menulist label="&choosefolderclickhere.label;" uri=""
     id="msgDraftsFolderPicker"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-    ignore="http://home.netscape.com/NC-rdf#MessageChild"
     ref="msgaccounts:/">
         <template>
           <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@@ -258,7 +255,6 @@ Rights Reserved.
   <menulist label="&choosefolderclickhere.label;" uri=""
     id="msgStationeryFolderPicker"
     datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-    ignore="http://home.netscape.com/NC-rdf#MessageChild"
     ref="msgaccounts:/">
         <template>
           <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@@ -313,7 +309,6 @@ Rights Reserved.
   <menu class="push" label="&chooseaccountclickhere.label;" 
         uri="" id="msgFccAccountPicker" 
         datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
-        ignore="http://home.netscape.com/NC-rdf#MessageChild"
         ref="msgaccounts:/">
     <template>
       <rule nc:IsServer="true" nc:CanCreateFoldersOnServer="true">
@@ -334,7 +329,6 @@ Rights Reserved.
   <menu class="push" label="&chooseaccountclickhere.label;" 
         uri="" id="msgDraftsAccountPicker" 
         datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
-        ignore="http://home.netscape.com/NC-rdf#MessageChild"
         ref="msgaccounts:/">
     <template>
       <rule nc:IsServer="true" nc:CanCreateFoldersOnServer="true">
@@ -355,7 +349,6 @@ Rights Reserved.
   <menu class="push" label="&chooseaccountclickhere.label;" 
         uri="" id="msgStationeryAccountPicker" 
         datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
-        ignore="http://home.netscape.com/NC-rdf#MessageChild"
         ref="msgaccounts:/">
     <template>
       <rule nc:IsServer="true" nc:CanCreateFoldersOnServer="true">