Backout Bug 674246 - Workaround event handler having the same original prototype node r=neil

editor/ui/composer/content/editor.xul

@@ -54,9 +54,7 @@
   <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
   <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
-  <popupset id="contentAreaContextSet">
-    <menupopup id="contentAreaContextMenu"/>
-  </popupset>
+  <popupset id="contentAreaContextSet"/>
   <menupopup id="structToolbarContext"/>
   <menupopup id="sidebarPopup"/>
   <menupopup id="popupNotificationMenu"/>

suite/mailnews/compose/messengercompose.xul

@@ -151,9 +151,7 @@
   <key id="key_renameAttachment"/>
 </keyset>
 
-  <popupset id="contentAreaContextSet">
-    <menupopup id="contentAreaContextMenu"/>
-  </popupset>
+  <popupset id="contentAreaContextSet"/>
 
   <popupset id="msgComposePopupSet">
     <menupopup id="sidebarPopup"/>