# HG changeset patch
# User Khushil Mistry <khushil324@gmail.com>
# Date 1568068800 -7200
# Node ID 2c47346623c48da709386b8dded13565ed627e1e
# Parent  23c18a98eb9b9787791b75932a448b0d39c4bdb5
Bug 1571687 - copy the parts of editor that are used by Thunderbird to mail/components/compose. r=mkmelin,pike

diff --git a/mail/app.mozbuild b/mail/app.mozbuild
--- a/mail/app.mozbuild
+++ b/mail/app.mozbuild
@@ -23,11 +23,10 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DI
 if CONFIG['MOZ_CALENDAR']:
     DIRS += [
         '/%s/calendar/lightning' % CONFIG['commreltopsrcdir'],
         '/%s/calendar/timezones' % CONFIG['commreltopsrcdir']
     ]
 
 DIRS += [
     '/%s/chat' % CONFIG['commreltopsrcdir'],
-    '/%s/editor/ui' % CONFIG['commreltopsrcdir'],
     '/%s/mail' % CONFIG['commreltopsrcdir'],
 ]
diff --git a/editor/ui/composer.js b/mail/components/compose/composer.js
copy from editor/ui/composer.js
copy to mail/components/compose/composer.js
diff --git a/editor/ui/composer/content/ComposerCommands.js b/mail/components/compose/content/ComposerCommands.js
copy from editor/ui/composer/content/ComposerCommands.js
copy to mail/components/compose/content/ComposerCommands.js
--- a/editor/ui/composer/content/ComposerCommands.js
+++ b/mail/components/compose/content/ComposerCommands.js
@@ -597,17 +597,17 @@ var nsSaveAndChangeEncodingCommand =
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
     SetEditMode(gPreviousNonSourceDisplayMode);
     window.ok = false;
     window.exportToText = false;
     var oldTitle = GetDocumentTitle();
-    window.openDialog("chrome://editor/content/EditorSaveAsCharset.xul","_blank", "chrome,close,titlebar,modal,resizable=yes");
+    window.openDialog("chrome://messenger/content/messengercompose/EditorSaveAsCharset.xul","_blank", "chrome,close,titlebar,modal,resizable=yes");
 
     if (GetDocumentTitle() != oldTitle)
       UpdateWindowTitle();
 
     if (window.ok)
     {
       if (window.exportToText)
       {
@@ -665,17 +665,17 @@ var nsPublishCommand =
       }
 
       if (showPublishDialog || !publishData)
       {
         // Show the publish dialog
         publishData = {};
         window.ok = false;
         let oldTitle = GetDocumentTitle();
-        window.openDialog("chrome://editor/content/EditorPublish.xul","_blank",
+        window.openDialog("chrome://messenger/content/messengercompose/EditorPublish.xul", "_blank",
                           "chrome,close,titlebar,modal", "", "", publishData);
         if (GetDocumentTitle() != oldTitle)
           UpdateWindowTitle();
 
         if (!window.ok)
           return false;
       }
       if (publishData)
@@ -702,17 +702,17 @@ var nsPublishAsCommand =
   {
     if (GetCurrentEditor())
     {
       SetEditMode(gPreviousNonSourceDisplayMode);
 
       window.ok = false;
       var publishData = {};
       var oldTitle = GetDocumentTitle();
-      window.openDialog("chrome://editor/content/EditorPublish.xul","_blank",
+      window.openDialog("chrome://messenger/content/messengercompose/EditorPublish.xul", "_blank",
                         "chrome,close,titlebar,modal", "", "", publishData);
       if (GetDocumentTitle() != oldTitle)
         UpdateWindowTitle();
 
       if (window.ok)
         return Publish(publishData);
     }
     return false;
@@ -1815,17 +1815,17 @@ function Publish(publishData)
 
   try {
     // We launch dialog as a dependent
     // Don't allow editing document!
     SetDocumentEditable(false);
 
     // Start progress monitoring
     gProgressDialog =
-      window.openDialog("chrome://editor/content/EditorPublishProgress.xul", "_blank",
+      window.openDialog("chrome://messenger/content/messengercompose/EditorPublishProgress.xul", "_blank",
                         "chrome,dependent,titlebar", gPublishData, gPersistObj);
 
   } catch (e) {}
 
   // Network transfer is often too quick for the progress dialog to be initialized
   //  and we can completely miss messages for quickly-terminated bad URLs,
   //  so we can't call OutputFileWithPersistAPI right away.
   // StartPublishing() is called at the end of the dialog's onload method
@@ -1983,17 +1983,17 @@ var nsPublishSettingsCommand =
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
     if (GetCurrentEditor())
     {
       // Launch Publish Settings dialog
 
-      window.ok = window.openDialog("chrome://editor/content/EditorPublishSettings.xul","_blank", "chrome,close,titlebar,modal", "");
+      window.ok = window.openDialog("chrome://messenger/content/messengercompose/EditorPublishSettings.xul", "_blank", "chrome,close,titlebar,modal", "");
       return window.ok;
     }
     return false;
   }
 }
 
 //-----------------------------------------------------------------------------------
 var nsRevertCommand =
@@ -2267,17 +2267,17 @@ var nsFindReplaceCommand =
     return editorElement.getEditor(editorElement.contentWindow) != null;
   },
 
   getCommandStateParams: function(aCommand, aParams, editorElement) {},
   doCommandParams: function(aCommand, aParams, editorElement) {},
 
   doCommand: function(aCommand, editorElement)
   {
-    window.openDialog("chrome://editor/content/EdReplace.xul", "_blank",
+    window.openDialog("chrome://messenger/content/messengercompose/EdReplace.xul", "_blank",
                       "chrome,modal,titlebar", editorElement);
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsFindCommand =
 {
   isCommandEnabled: function(aCommand, editorElement)
@@ -2344,17 +2344,17 @@ var nsSpellingCommand =
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
     window.cancelSendMessage = false;
     try {
       var skipBlockQuotes = (window.document.documentElement.getAttribute("windowtype") == "msgcompose");
-      window.openDialog("chrome://editor/content/EdSpellCheck.xul", "_blank",
+      window.openDialog("chrome://messenger/content/messengercompose/EdSpellCheck.xul", "_blank",
               "dialog,close,titlebar,modal,resizable", false, skipBlockQuotes, true);
     }
     catch(ex) {}
   }
 };
 
 // Validate using http://validator.w3.org/file-upload.html
 var URL2Validate;
@@ -2421,102 +2421,102 @@ var nsFormCommand =
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdFormProps.xul", "_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdFormProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsInputTagCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdInputProps.xul", "_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdInputProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsInputImageCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdInputImage.xul", "_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdInputImage.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsTextAreaCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdTextAreaProps.xul", "_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdTextAreaProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsSelectCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdSelectProps.xul", "_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdSelectProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsButtonCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdButtonProps.xul", "_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdButtonProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsLabelCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
@@ -2534,17 +2534,17 @@ var nsLabelCommand =
       // Find selected label or if start/end of selection is in label
       var labelElement = editor.getSelectedElement(tagName);
       if (!labelElement)
         labelElement = editor.getElementOrParentByTagName(tagName, editor.selection.anchorNode);
       if (!labelElement)
         labelElement = editor.getElementOrParentByTagName(tagName, editor.selection.focusNode);
       if (labelElement) {
         // We only open the dialog for an existing label
-        window.openDialog("chrome://editor/content/EdLabelProps.xul", "_blank", "chrome,close,titlebar,modal", labelElement);
+        window.openDialog("chrome://messenger/content/messengercompose/EdLabelProps.xul", "_blank", "chrome,close,titlebar,modal", labelElement);
       } else {
         EditorSetTextProperty(tagName, "", "");
       }
     } catch (e) {}
   }
 };
 
 //-----------------------------------------------------------------------------------
@@ -2555,17 +2555,17 @@ var nsFieldSetCommand =
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdFieldSetProps.xul", "_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdFieldSetProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsIsIndexCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
@@ -2594,17 +2594,17 @@ var nsImageCommand =
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdImageProps.xul","_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdImageProps.xul","_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsHLineCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
@@ -2626,17 +2626,17 @@ var nsHLineCommand =
     var hLine;
     try {
       hLine = editor.getSelectedElement(tagName);
     } catch (e) {return;}
 
     if (hLine)
     {
       // We only open the dialog for an existing HRule
-      window.openDialog("chrome://editor/content/EdHLineProps.xul", "_blank", "chrome,close,titlebar,modal");
+      window.openDialog("chrome://messenger/content/messengercompose/EdHLineProps.xul", "_blank", "chrome,close,titlebar,modal");
     }
     else
     {
       try {
         hLine = editor.createElementWithDefaults(tagName);
 
         // We change the default attributes to those saved in the user prefs
         let align = Services.prefs.getIntPref("editor.hrule.align");
@@ -2680,70 +2680,70 @@ var nsLinkCommand =
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
     // If selected element is an image, launch that dialog instead
     // since last tab panel handles link around an image
     var element = GetObjectForProperties();
     if (element && element.nodeName.toLowerCase() == "img")
-      window.openDialog("chrome://editor/content/EdImageProps.xul","_blank", "chrome,close,titlebar,modal", null, true);
+      window.openDialog("chrome://messenger/content/messengercompose/EdImageProps.xul", "_blank", "chrome,close,titlebar,modal", null, true);
     else
-      window.openDialog("chrome://editor/content/EdLinkProps.xul","_blank", "chrome,close,titlebar,modal");
+      window.openDialog("chrome://messenger/content/messengercompose/EdLinkProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsAnchorCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdNamedAnchorProps.xul", "_blank", "chrome,close,titlebar,modal", "");
+    window.openDialog("chrome://messenger/content/messengercompose/EdNamedAnchorProps.xul", "_blank", "chrome,close,titlebar,modal", "");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsInsertHTMLWithDialogCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdInsSrc.xul","_blank", "chrome,close,titlebar,modal,resizable", "");
+    window.openDialog("chrome://messenger/content/messengercompose/EdInsSrc.xul", "_blank", "chrome,close,titlebar,modal,resizable", "");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsInsertMathWithDialogCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdInsertMath.xul", "_blank", "chrome,close,titlebar,modal,resizable", "");
+    window.openDialog("chrome://messenger/content/messengercompose/EdInsertMath.xul", "_blank", "chrome,close,titlebar,modal,resizable", "");
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsInsertCharsCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
@@ -2805,17 +2805,17 @@ var nsGridCommand =
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdSnapToGrid.xul","_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdSnapToGrid.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 
 //-----------------------------------------------------------------------------------
 var nsListPropertiesCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
@@ -2823,17 +2823,17 @@ var nsListPropertiesCommand =
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdListProps.xul","_blank", "chrome,close,titlebar,modal");
+    window.openDialog("chrome://messenger/content/messengercompose/EdListProps.xul", "_blank", "chrome,close,titlebar,modal");
   }
 };
 
 
 //-----------------------------------------------------------------------------------
 var nsPagePropertiesCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
@@ -2842,17 +2842,17 @@ var nsPagePropertiesCommand =
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
     var oldTitle = GetDocumentTitle();
-    window.openDialog("chrome://editor/content/EdPageProps.xul","_blank", "chrome,close,titlebar,modal", "");
+    window.openDialog("chrome://messenger/content/messengercompose/EdPageProps.xul", "_blank", "chrome,close,titlebar,modal", "");
 
     // Update main window title and
     // recent menu data in prefs if doc title changed
     if (GetDocumentTitle() != oldTitle)
       UpdateWindowTitle();
   }
 };
 
@@ -3048,17 +3048,17 @@ var nsSetSmiley =
   doCommand: function(aCommand) {}
 };
 
 
 function doAdvancedProperties(element)
 {
   if (element)
   {
-    window.openDialog("chrome://editor/content/EdAdvancedEdit.xul", "_blank", "chrome,close,titlebar,modal,resizable=yes", "", element);
+    window.openDialog("chrome://messenger/content/messengercompose/EdAdvancedEdit.xul", "_blank", "chrome,close,titlebar,modal,resizable=yes", "", element);
   }
 }
 
 var nsAdvancedPropertiesCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
   {
     return (IsDocumentEditable() && IsEditingRenderedHTML());
@@ -3085,17 +3085,17 @@ var nsColorPropertiesCommand =
     return (IsDocumentEditable() && IsEditingRenderedHTML());
   },
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
-    window.openDialog("chrome://editor/content/EdColorProps.xul","_blank", "chrome,close,titlebar,modal", "");
+    window.openDialog("chrome://messenger/content/messengercompose/EdColorProps.xul", "_blank", "chrome,close,titlebar,modal", "");
     UpdateDefaultColors();
   }
 };
 
 //-----------------------------------------------------------------------------------
 var nsIncreaseFontCommand =
 {
   isCommandEnabled: function(aCommand, dummy)
@@ -3873,13 +3873,13 @@ var nsConvertToTable =
 
   getCommandStateParams: function(aCommand, aParams, aRefCon) {},
   doCommandParams: function(aCommand, aParams, aRefCon) {},
 
   doCommand: function(aCommand)
   {
     if (this.isCommandEnabled())
     {
-      window.openDialog("chrome://editor/content/EdConvertToTable.xul","_blank", "chrome,close,titlebar,modal")
+      window.openDialog("chrome://messenger/content/messengercompose/EdConvertToTable.xul", "_blank", "chrome,close,titlebar,modal")
     }
   }
 };
 
diff --git a/editor/ui/composer/content/EditorContent.css b/mail/components/compose/content/EditorContent.css
copy from editor/ui/composer/content/EditorContent.css
copy to mail/components/compose/content/EditorContent.css
--- a/editor/ui/composer/content/EditorContent.css
+++ b/mail/components/compose/content/EditorContent.css
@@ -9,17 +9,17 @@
  *  place in EditorOverride.css, instead of here.
 */
 
 @import url(chrome://communicator/skin/smileys.css);
 
 a[name] {
   min-height: 17px; margin-left: 2px; margin-top: 2px;
   padding-left: 20px; 
-  background-image: url(chrome://editor/content/images/tag-anchor.gif);
+  background-image: url(chrome://messenger/content/messengercompose/images/tag-anchor.gif);
   background-repeat: no-repeat; 
   background-position: top left;
 }
 
 /* Force border display for empty cells 
    and tables with 0 border
 */
 table {
diff --git a/mail/components/compose/content/MsgComposeCommands.js b/mail/components/compose/content/MsgComposeCommands.js
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -819,17 +819,17 @@ var defaultController = {
       isEnabled: function() {
         return true;
       },
       doCommand: function() {
         window.cancelSendMessage = false;
         var skipBlockQuotes =
           (window.document.documentElement.getAttribute("windowtype") ==
           "msgcompose");
-        window.openDialog("chrome://editor/content/EdSpellCheck.xul", "_blank",
+        window.openDialog("chrome://messenger/content/messengercompose/EdSpellCheck.xul", "_blank",
                           "dialog,close,titlebar,modal,resizable",
                           false, skipBlockQuotes, true);
       }
     },
 
     cmd_fullZoomToggle: {
       isEnabled: function () {
         return true;
@@ -2936,17 +2936,17 @@ function GenericSendMessage(msgType)
     // Do we need to check the spelling?
     if (DoSpellCheckBeforeSend())
     {
       // We disable spellcheck for the following -subject line, attachment
       // pane, identity and addressing widget therefore we need to explicitly
       // focus on the mail body when we have to do a spellcheck.
       SetMsgBodyFrameFocus();
       window.cancelSendMessage = false;
-      window.openDialog("chrome://editor/content/EdSpellCheck.xul", "_blank",
+      window.openDialog("chrome://messenger/content/messengercompose/EdSpellCheck.xul", "_blank",
                         "dialog,close,titlebar,modal,resizable", true, true, false);
 
       if (window.cancelSendMessage)
         return;
     }
 
     // Strip trailing spaces and long consecutive WSP sequences from the
     // subject line to prevent getting only WSP chars on a folded line.
diff --git a/editor/ui/dialogs/content/EdAEAttributes.js b/mail/components/compose/content/dialogs/EdAEAttributes.js
copy from editor/ui/dialogs/content/EdAEAttributes.js
copy to mail/components/compose/content/dialogs/EdAEAttributes.js
diff --git a/editor/ui/dialogs/content/EdAECSSAttributes.js b/mail/components/compose/content/dialogs/EdAECSSAttributes.js
copy from editor/ui/dialogs/content/EdAECSSAttributes.js
copy to mail/components/compose/content/dialogs/EdAECSSAttributes.js
diff --git a/editor/ui/dialogs/content/EdAEHTMLAttributes.js b/mail/components/compose/content/dialogs/EdAEHTMLAttributes.js
copy from editor/ui/dialogs/content/EdAEHTMLAttributes.js
copy to mail/components/compose/content/dialogs/EdAEHTMLAttributes.js
diff --git a/editor/ui/dialogs/content/EdAEJSEAttributes.js b/mail/components/compose/content/dialogs/EdAEJSEAttributes.js
copy from editor/ui/dialogs/content/EdAEJSEAttributes.js
copy to mail/components/compose/content/dialogs/EdAEJSEAttributes.js
diff --git a/editor/ui/dialogs/content/EdAdvancedEdit.js b/mail/components/compose/content/dialogs/EdAdvancedEdit.js
copy from editor/ui/dialogs/content/EdAdvancedEdit.js
copy to mail/components/compose/content/dialogs/EdAdvancedEdit.js
diff --git a/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mail/components/compose/content/dialogs/EdAdvancedEdit.xul
copy from editor/ui/dialogs/content/EdAdvancedEdit.xul
copy to mail/components/compose/content/dialogs/EdAdvancedEdit.xul
--- a/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/mail/components/compose/content/dialogs/EdAdvancedEdit.xul
@@ -5,38 +5,38 @@
 
 <!-- first checkin of the year 2000!      -->
 <!-- Ben Goodger, 12:50AM, 01/00/00 NZST  -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <!-- May not need this here -->
-<!-- <?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> -->
+<!-- <?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> -->
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdAdvancedEdit.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EdAdvancedEdit.dtd">
 <dialog title="&WindowTitle.label;"
     id="advancedEditDlg"
     style="width: 40em;"
     xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
   <!-- element page functions -->
-  <script src="chrome://editor/content/EdAEHTMLAttributes.js"/>
-  <script src="chrome://editor/content/EdAECSSAttributes.js"/>
-  <script src="chrome://editor/content/EdAEJSEAttributes.js"/>
-  <script src="chrome://editor/content/EdAEAttributes.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdAEHTMLAttributes.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdAECSSAttributes.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdAEJSEAttributes.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdAEAttributes.js"/>
 
   <!-- global dialog functions -->
-  <script src="chrome://editor/content/EdAdvancedEdit.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdAdvancedEdit.js"/>
 
   <hbox>
     <label value="&currentattributesfor.label;"/>
     <label class="header" id="tagLabel"/>
   </hbox>
   
   <separator class="thin"/>
   
diff --git a/editor/ui/dialogs/content/EdButtonProps.js b/mail/components/compose/content/dialogs/EdButtonProps.js
copy from editor/ui/dialogs/content/EdButtonProps.js
copy to mail/components/compose/content/dialogs/EdButtonProps.js
diff --git a/editor/ui/dialogs/content/EdButtonProps.xul b/mail/components/compose/content/dialogs/EdButtonProps.xul
copy from editor/ui/dialogs/content/EdButtonProps.xul
copy to mail/components/compose/content/dialogs/EdButtonProps.xul
--- a/editor/ui/dialogs/content/EdButtonProps.xul
+++ b/mail/components/compose/content/dialogs/EdButtonProps.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorButtonProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorButtonProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdButtonProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome:///messenger/content/messengercomposeEdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdButtonProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption label="&Settings.label;"/>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="ButtonType" value="&ButtonType.label;" accesskey="&ButtonType.accesskey;"/>
diff --git a/editor/ui/dialogs/content/EdColorPicker.js b/mail/components/compose/content/dialogs/EdColorPicker.js
copy from editor/ui/dialogs/content/EdColorPicker.js
copy to mail/components/compose/content/dialogs/EdColorPicker.js
diff --git a/editor/ui/dialogs/content/EdColorPicker.xul b/mail/components/compose/content/dialogs/EdColorPicker.xul
copy from editor/ui/dialogs/content/EdColorPicker.xul
copy to mail/components/compose/content/dialogs/EdColorPicker.xul
--- a/editor/ui/dialogs/content/EdColorPicker.xul
+++ b/mail/components/compose/content/dialogs/EdColorPicker.xul
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdColorPicker.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EdColorPicker.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancelColor();">
 
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdColorPicker.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdColorPicker.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <hbox id="TableOrCellGroup" align="center" collapsed="true">
     <label control="CellOrTableGroup" value="&background.label;" accesskey="&background.accessKey;"/>
     <radiogroup id="CellOrTableGroup" orient="horizontal">
       <radio id="TableRadio" label="&table.label;" accesskey="&table.accessKey;"/>
       <radio id="CellRadio"  label="&cell.label;"  accesskey="&cell.accessKey;"/>
diff --git a/editor/ui/dialogs/content/EdColorProps.js b/mail/components/compose/content/dialogs/EdColorProps.js
copy from editor/ui/dialogs/content/EdColorProps.js
copy to mail/components/compose/content/dialogs/EdColorProps.js
--- a/editor/ui/dialogs/content/EdColorProps.js
+++ b/mail/components/compose/content/dialogs/EdColorProps.js
@@ -185,17 +185,17 @@ function GetColorAndUpdate(ColorWellID)
       colorObj.TextColor = customVisitedColor;
       break;
     case "backgroundCW":
       colorObj.Type = "Page";
       colorObj.PageColor = customBackgroundColor;
       break;
   }
 
-  window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", colorObj);
+  window.openDialog("chrome://messenger/content/messengercompose/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", colorObj);
 
   // User canceled the dialog
   if (colorObj.Cancel)
     return;
 
   var color = "";
   switch( ColorWellID )
   {
diff --git a/editor/ui/dialogs/content/EdColorProps.xul b/mail/components/compose/content/dialogs/EdColorProps.xul
copy from editor/ui/dialogs/content/EdColorProps.xul
copy to mail/components/compose/content/dialogs/EdColorProps.xul
--- a/editor/ui/dialogs/content/EdColorProps.xul
+++ b/mail/components/compose/content/dialogs/EdColorProps.xul
@@ -2,29 +2,29 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorColorProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorColorProperties.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdColorProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdColorProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox align="start">
     <caption label="&pageColors.label;"/>
     <radiogroup id="PageColorGroup">
       <radio id="DefaultColorsRadio" label="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
         accesskey="&defaultColorsRadio.accessKey;"
diff --git a/editor/ui/dialogs/content/EdConvertToTable.js b/mail/components/compose/content/dialogs/EdConvertToTable.js
copy from editor/ui/dialogs/content/EdConvertToTable.js
copy to mail/components/compose/content/dialogs/EdConvertToTable.js
diff --git a/editor/ui/dialogs/content/EdConvertToTable.xul b/mail/components/compose/content/dialogs/EdConvertToTable.xul
copy from editor/ui/dialogs/content/EdConvertToTable.xul
copy to mail/components/compose/content/dialogs/EdConvertToTable.xul
--- a/editor/ui/dialogs/content/EdConvertToTable.xul
+++ b/mail/components/compose/content/dialogs/EdConvertToTable.xul
@@ -2,32 +2,32 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdConvertToTable.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EdConvertToTable.dtd">
 
 <dialog title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    onload = "Startup()"
    ondialogaccept="return onAccept();"
    ondialogcancel="return onCancel();"
    style="min-width:20em">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script src="chrome://editor/content/EdConvertToTable.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdConvertToTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <description class="wrap" flex="1">&instructions1.label;</description>
   <description class="wrap" flex="1">&instructions2.label;</description>
   <radiogroup id="SepRadioGroup" persist="index character" index="0" character="">
     <radio id="comma" label="&commaRadio.label;" oncommand="SelectCharacter('0');"/>
     <radio id="space" label="&spaceRadio.label;" oncommand="SelectCharacter('1');"/>
     <hbox>
diff --git a/editor/ui/dialogs/content/EdDialogCommon.js b/mail/components/compose/content/dialogs/EdDialogCommon.js
copy from editor/ui/dialogs/content/EdDialogCommon.js
copy to mail/components/compose/content/dialogs/EdDialogCommon.js
--- a/editor/ui/dialogs/content/EdDialogCommon.js
+++ b/mail/components/compose/content/dialogs/EdDialogCommon.js
@@ -286,17 +286,17 @@ function onAdvancedEdit()
 {
   // First validate data from widgets in the "simpler" property dialog
   if (ValidateData())
   {
     // Set true if OK is clicked in the Advanced Edit dialog
     window.AdvancedEditOK = false;
     // Open the AdvancedEdit dialog, passing in the element to be edited
     //  (the copy named "globalElement")
-    window.openDialog("chrome://editor/content/EdAdvancedEdit.xul", "_blank", "chrome,close,titlebar,modal,resizable=yes", "", globalElement);
+    window.openDialog("chrome://messenger/content/messengercompose/EdAdvancedEdit.xul", "_blank", "chrome,close,titlebar,modal,resizable=yes", "", globalElement);
     window.focus();
     if (window.AdvancedEditOK)
     {
       // Copy edited attributes to the dialog widgets:
       InitDialog();
     }
   }
 }
diff --git a/editor/ui/dialogs/content/EdDialogOverlay.xul b/mail/components/compose/content/dialogs/EdDialogOverlay.xul
copy from editor/ui/dialogs/content/EdDialogOverlay.xul
copy to mail/components/compose/content/dialogs/EdDialogOverlay.xul
--- a/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/mail/components/compose/content/dialogs/EdDialogOverlay.xul
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!DOCTYPE overlay SYSTEM "chrome://editor/locale/EdDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/messengercompose/EdDialogOverlay.dtd">
 
 <overlay id="EdDialogOverlay"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <vbox id="AdvancedEdit">
   <hbox flex="1" style="margin-top: 0.2em" align="center">
     <!-- This will right-align the button -->
     <spacer flex="1"/>
diff --git a/editor/ui/dialogs/content/EdDictionary.js b/mail/components/compose/content/dialogs/EdDictionary.js
copy from editor/ui/dialogs/content/EdDictionary.js
copy to mail/components/compose/content/dialogs/EdDictionary.js
diff --git a/editor/ui/dialogs/content/EdDictionary.xul b/mail/components/compose/content/dialogs/EdDictionary.xul
copy from editor/ui/dialogs/content/EdDictionary.xul
copy to mail/components/compose/content/dialogs/EdDictionary.xul
--- a/editor/ui/dialogs/content/EdDictionary.xul
+++ b/mail/components/compose/content/dialogs/EdDictionary.xul
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPersonalDictionary.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorPersonalDictionary.dtd">
 <dialog buttons="cancel" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     persist="screenX screenY"
     onload = "Startup()"
     ondialogcancel="return onClose();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdDictionary.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDictionary.js"/>
   
   <grid>
     <columns><column style="width: 15em" flex="1"/><column flex="1"/></columns>
     <rows>
       <row>
         <label value="&wordEditField.label;"
                control="WordInput"
                accesskey="&wordEditField.accessKey;"/>
diff --git a/editor/ui/dialogs/content/EdFieldSetProps.js b/mail/components/compose/content/dialogs/EdFieldSetProps.js
copy from editor/ui/dialogs/content/EdFieldSetProps.js
copy to mail/components/compose/content/dialogs/EdFieldSetProps.js
diff --git a/editor/ui/dialogs/content/EdFieldSetProps.xul b/mail/components/compose/content/dialogs/EdFieldSetProps.xul
copy from editor/ui/dialogs/content/EdFieldSetProps.xul
copy to mail/components/compose/content/dialogs/EdFieldSetProps.xul
--- a/editor/ui/dialogs/content/EdFieldSetProps.xul
+++ b/mail/components/compose/content/dialogs/EdFieldSetProps.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorFieldSetProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorFieldSetProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdFieldSetProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdFieldSetProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption label="&Legend.label;" accesskey="&Legend.accesskey;"/>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <checkbox id="EditText" label="&EditLegendText.label;" accesskey="&EditLegendText.accesskey;" checked="true" disabled="true"
diff --git a/editor/ui/dialogs/content/EdFormProps.js b/mail/components/compose/content/dialogs/EdFormProps.js
copy from editor/ui/dialogs/content/EdFormProps.js
copy to mail/components/compose/content/dialogs/EdFormProps.js
diff --git a/editor/ui/dialogs/content/EdFormProps.xul b/mail/components/compose/content/dialogs/EdFormProps.xul
copy from editor/ui/dialogs/content/EdFormProps.xul
copy to mail/components/compose/content/dialogs/EdFormProps.xul
--- a/editor/ui/dialogs/content/EdFormProps.xul
+++ b/mail/components/compose/content/dialogs/EdFormProps.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorFormProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorFormProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdFormProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdFormProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption label="&Settings.label;"/>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="FormName" value="&FormName.label;" accesskey="&FormName.accesskey;"/>
diff --git a/editor/ui/dialogs/content/EdHLineProps.js b/mail/components/compose/content/dialogs/EdHLineProps.js
copy from editor/ui/dialogs/content/EdHLineProps.js
copy to mail/components/compose/content/dialogs/EdHLineProps.js
diff --git a/editor/ui/dialogs/content/EdHLineProps.xul b/mail/components/compose/content/dialogs/EdHLineProps.xul
copy from editor/ui/dialogs/content/EdHLineProps.xul
copy to mail/components/compose/content/dialogs/EdHLineProps.xul
--- a/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mail/components/compose/content/dialogs/EdHLineProps.xul
@@ -2,31 +2,31 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorHLineProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorHLineProperties.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script src="chrome://editor/content/EdHLineProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdHLineProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption label="&dimensionsBox.label;"/>
     <grid>
       <columns><column/><column/><column /></columns>
       <rows>
         <row align="center">
diff --git a/editor/ui/dialogs/content/EdImageOverlay.js b/mail/components/compose/content/dialogs/EdImageOverlay.js
copy from editor/ui/dialogs/content/EdImageOverlay.js
copy to mail/components/compose/content/dialogs/EdImageOverlay.js
diff --git a/editor/ui/dialogs/content/EdImageOverlay.xul b/mail/components/compose/content/dialogs/EdImageOverlay.xul
copy from editor/ui/dialogs/content/EdImageOverlay.xul
copy to mail/components/compose/content/dialogs/EdImageOverlay.xul
--- a/editor/ui/dialogs/content/EdImageOverlay.xul
+++ b/mail/components/compose/content/dialogs/EdImageOverlay.xul
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!DOCTYPE overlay SYSTEM "chrome://editor/locale/EditorImageProperties.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/messengercompose/EditorImageProperties.dtd">
 
 <overlay id="EdImageOverlay"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script src="chrome://editor/content/EdImageOverlay.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdImageOverlay.js"/>
 
   <tab id="imageInputTab" label="&imageInputTab.label;"/>
   <tab id="imageLocationTab" label="&imageLocationTab.label;"/>
   <tab id="imageDimensionsTab" label="&imageDimensionsTab.label;"/>
   <tab id="imageAppearanceTab" label="&imageAppearanceTab.label;"/>
   <tab id="imageLinkTab" label="&imageLinkTab.label;"/>
 
   <vbox id="imageLocation"> 
diff --git a/editor/ui/dialogs/content/EdImageProps.js b/mail/components/compose/content/dialogs/EdImageProps.js
copy from editor/ui/dialogs/content/EdImageProps.js
copy to mail/components/compose/content/dialogs/EdImageProps.js
--- a/editor/ui/dialogs/content/EdImageProps.js
+++ b/mail/components/compose/content/dialogs/EdImageProps.js
@@ -302,15 +302,15 @@ function onAccept()
   gDoAltTextError = false;
 
   return false;
 }
 
 function onLinkAdvancedEdit()
 {
   window.AdvancedEditOK = false;
-  window.openDialog("chrome://editor/content/EdAdvancedEdit.xul", "_blank",
+  window.openDialog("chrome://messenger/content/messengercompose/EdAdvancedEdit.xul", "_blank",
                     "chrome,close,titlebar,modal,resizable=yes", "",
                     gLinkElement);
   window.focus();
   if (window.AdvancedEditOK)
     gDialog.hrefInput.value = gLinkElement.getAttribute("href");
 }
diff --git a/editor/ui/dialogs/content/EdImageProps.xul b/mail/components/compose/content/dialogs/EdImageProps.xul
copy from editor/ui/dialogs/content/EdImageProps.xul
copy to mail/components/compose/content/dialogs/EdImageProps.xul
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mail/components/compose/content/dialogs/EdImageProps.xul
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdImageOverlay.xul"?>
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdImageOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorImageProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorImageProperties.dtd">
 
 
 <!-- dialog containing a control requiring initial setup -->
 <dialog id="imageDlg" title="&windowTitle.label;"
     xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
     buttons="accept,cancel"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdImageProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdImageProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="imageLocationTab"/>
       <tab id="imageDimensionsTab"/>
       <tab id="imageAppearanceTab"/>
diff --git a/editor/ui/dialogs/content/EdInputImage.js b/mail/components/compose/content/dialogs/EdInputImage.js
copy from editor/ui/dialogs/content/EdInputImage.js
copy to mail/components/compose/content/dialogs/EdInputImage.js
diff --git a/editor/ui/dialogs/content/EdInputImage.xul b/mail/components/compose/content/dialogs/EdInputImage.xul
copy from editor/ui/dialogs/content/EdInputImage.xul
copy to mail/components/compose/content/dialogs/EdInputImage.xul
--- a/editor/ui/dialogs/content/EdInputImage.xul
+++ b/mail/components/compose/content/dialogs/EdInputImage.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdImageOverlay.xul"?> 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdImageOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInputProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorInputProperties.dtd">
 <dialog title="&windowTitleImage.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdInputImage.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdInputImage.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="imageInputTab"/>
       <tab id="imageLocationTab"/>
       <tab id="imageDimensionsTab"/>
diff --git a/editor/ui/dialogs/content/EdInputProps.js b/mail/components/compose/content/dialogs/EdInputProps.js
copy from editor/ui/dialogs/content/EdInputProps.js
copy to mail/components/compose/content/dialogs/EdInputProps.js
--- a/editor/ui/dialogs/content/EdInputProps.js
+++ b/mail/components/compose/content/dialogs/EdInputProps.js
@@ -207,17 +207,17 @@ function onInput()
   {
     gDialog.accept.disabled = disabled;
     gDialog.AdvancedEditButton.disabled = disabled;
   }
 }
 
 function doImageProperties()
 {
-  window.openDialog("chrome://editor/content/EdImageProps.xul",
+  window.openDialog("chrome://messenger/content/messengercompose/EdImageProps.xul",
                     "_blank", "chrome,close,titlebar,modal", globalElement);
   window.focus();
   onInput();
 }
 
 function ValidateData()
 {
   var attributes = {
diff --git a/editor/ui/dialogs/content/EdInputProps.xul b/mail/components/compose/content/dialogs/EdInputProps.xul
copy from editor/ui/dialogs/content/EdInputProps.xul
copy to mail/components/compose/content/dialogs/EdInputProps.xul
--- a/editor/ui/dialogs/content/EdInputProps.xul
+++ b/mail/components/compose/content/dialogs/EdInputProps.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInputProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorInputProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdInputProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdInputProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption><label control="InputType" value="&InputType.label;" accesskey="&InputType.accesskey;"/></caption>
     <menulist id="InputType" oncommand="SelectInputType();">
       <menupopup>
         <menuitem label="&text.value;"/>
         <menuitem label="&password.value;"/>
diff --git a/editor/ui/dialogs/content/EdInsSrc.js b/mail/components/compose/content/dialogs/EdInsSrc.js
copy from editor/ui/dialogs/content/EdInsSrc.js
copy to mail/components/compose/content/dialogs/EdInsSrc.js
diff --git a/editor/ui/dialogs/content/EdInsSrc.xul b/mail/components/compose/content/dialogs/EdInsSrc.xul
copy from editor/ui/dialogs/content/EdInsSrc.xul
copy to mail/components/compose/content/dialogs/EdInsSrc.xul
--- a/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/mail/components/compose/content/dialogs/EdInsSrc.xul
@@ -2,32 +2,32 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertSource.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertSource.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
     buttonlabelaccept="&insertButton.label;"
     buttonaccesskeyaccept="&insertButton.accesskey;"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdInsSrc.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdInsSrc.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label id="srcMessage" value="&sourceEditField.label;"/>
   <vbox flex="1" style="width: 30em; height: 20em;">
     <textbox id="srcInput" multiline="true" rows="1" style="width: 1em" flex="1" class="uri-element"/>
   </vbox>
   <!-- Will this accept the embedded HTML tags? -->
diff --git a/editor/ui/dialogs/content/EdInsertChars.js b/mail/components/compose/content/dialogs/EdInsertChars.js
copy from editor/ui/dialogs/content/EdInsertChars.js
copy to mail/components/compose/content/dialogs/EdInsertChars.js
diff --git a/editor/ui/dialogs/content/EdInsertChars.xul b/mail/components/compose/content/dialogs/EdInsertChars.xul
copy from editor/ui/dialogs/content/EdInsertChars.xul
copy to mail/components/compose/content/dialogs/EdInsertChars.xul
--- a/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/mail/components/compose/content/dialogs/EdInsertChars.xul
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertChars.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertChars.dtd">
 
 <dialog id="insertCharsDlg" title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload = "Startup()"
         onfocus = "onFocus()"
         buttonlabelaccept="&insertButton.label;"
         buttonlabelcancel="&closeButton.label;"
         ondialogaccept = "return onAccept();"
         ondialogcancel = "return onClose();"
         style = "width: 20em">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdInsertChars.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdInsertChars.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption label="&category.label;"/>
     <radiogroup id="CatGrp" persist="category letter_index char_index">
       <radio id="AccentUpper" label="&accentUpper.label;"   oncommand="ChangeCategory(this.id)"/>
       <radio id="AccentLower" label="&accentLower.label;"   oncommand="ChangeCategory(this.id)"/>
       <radio id="Upper"       label="&otherUpper.label;"    oncommand="ChangeCategory(this.id)"/>
diff --git a/editor/ui/dialogs/content/EdInsertMath.js b/mail/components/compose/content/dialogs/EdInsertMath.js
copy from editor/ui/dialogs/content/EdInsertMath.js
copy to mail/components/compose/content/dialogs/EdInsertMath.js
--- a/editor/ui/dialogs/content/EdInsertMath.js
+++ b/mail/components/compose/content/dialogs/EdInsertMath.js
@@ -27,17 +27,17 @@ function Startup()
   gDialog.input.focus();
 
   // Load TeXZilla
   // TeXZilla.js contains non-ASCII characters and explicitly sets
   // window.TeXZilla, so we have to specify the charset parameter but don't
   // need to worry about the targetObj parameter.
   Cc["@mozilla.org/moz/jssubscript-loader;1"]
     .getService(Ci.mozIJSSubScriptLoader)
-    .loadSubScript("chrome://editor/content/TeXZilla.js", {}, "UTF-8");
+    .loadSubScript("chrome://messenger/content/messengercompose/TeXZilla.js", {}, "UTF-8");
 
   // Verify if the selection is on a <math> and initialize the dialog.
   gDialog.oldMath = editor.getElementOrParentByTagName("math", null);
   if (gDialog.oldMath) {
     // When these attributes are absent or invalid, they default to "inline" and "ltr" respectively.
     gDialog.mode.selectedIndex = gDialog.oldMath.getAttribute("display") == "block" ? 1 : 0;
     gDialog.direction.selectedIndex = gDialog.oldMath.getAttribute("dir") == "rtl" ? 1 : 0;
     gDialog.input.value = TeXZilla.getTeXSource(gDialog.oldMath);
diff --git a/editor/ui/dialogs/content/EdInsertMath.xul b/mail/components/compose/content/dialogs/EdInsertMath.xul
copy from editor/ui/dialogs/content/EdInsertMath.xul
copy to mail/components/compose/content/dialogs/EdInsertMath.xul
--- a/editor/ui/dialogs/content/EdInsertMath.xul
+++ b/mail/components/compose/content/dialogs/EdInsertMath.xul
@@ -2,32 +2,32 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
 - License, v. 2.0. If a copy of the MPL was not distributed with this
 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertMath.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertMath.dtd">
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttonlabelaccept="&insertButton.label;"
         buttonaccesskeyaccept="&insertButton.accesskey;"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdInsertMath.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdInsertMath.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label id="srcMessage" value="&sourceEditField.label;"/>
   <textbox id="input" rows="5" multiline="true" oninput="updateMath();"
            placeholder="\sqrt{x_1} + \frac{π^3}{2}"/>
   <vbox flex="1" style="overflow: auto; width: 30em; height: 5em;">
     <description id="output"/>
diff --git a/editor/ui/dialogs/content/EdInsertTOC.js b/mail/components/compose/content/dialogs/EdInsertTOC.js
copy from editor/ui/dialogs/content/EdInsertTOC.js
copy to mail/components/compose/content/dialogs/EdInsertTOC.js
diff --git a/editor/ui/dialogs/content/EdInsertTOC.xul b/mail/components/compose/content/dialogs/EdInsertTOC.xul
copy from editor/ui/dialogs/content/EdInsertTOC.xul
copy to mail/components/compose/content/dialogs/EdInsertTOC.xul
--- a/editor/ui/dialogs/content/EdInsertTOC.xul
+++ b/mail/components/compose/content/dialogs/EdInsertTOC.xul
@@ -2,33 +2,33 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?>
 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertTOC.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertTOC.dtd">
 
 <dialog title="&Window.title;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup();"
     ondialogaccept="return BuildTOC(true);"
     oncancel="window.close(); return true;">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
 
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdInsertTOC.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdInsertTOC.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <spacer id="dummy" style="display:none"/>
   <vbox flex="1">
     <groupbox><caption label="&buildToc.label;"/>
       <grid>
         <columns><column/><column style="min-width: 6em"/><column/></columns>
         <rows>
diff --git a/editor/ui/dialogs/content/EdInsertTable.js b/mail/components/compose/content/dialogs/EdInsertTable.js
copy from editor/ui/dialogs/content/EdInsertTable.js
copy to mail/components/compose/content/dialogs/EdInsertTable.js
diff --git a/editor/ui/dialogs/content/EdInsertTable.xul b/mail/components/compose/content/dialogs/EdInsertTable.xul
copy from editor/ui/dialogs/content/EdInsertTable.xul
copy to mail/components/compose/content/dialogs/EdInsertTable.xul
--- a/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mail/components/compose/content/dialogs/EdInsertTable.xul
@@ -2,30 +2,30 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertTable.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertTable.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdInsertTable.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdInsertTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <groupbox><caption label="&size.label;"/>
     <grid>
       <columns>
         <column flex="1"/>
         <column flex="1"/>
         <column flex="6"/>
diff --git a/editor/ui/dialogs/content/EdLabelProps.js b/mail/components/compose/content/dialogs/EdLabelProps.js
copy from editor/ui/dialogs/content/EdLabelProps.js
copy to mail/components/compose/content/dialogs/EdLabelProps.js
diff --git a/editor/ui/dialogs/content/EdLabelProps.xul b/mail/components/compose/content/dialogs/EdLabelProps.xul
copy from editor/ui/dialogs/content/EdLabelProps.xul
copy to mail/components/compose/content/dialogs/EdLabelProps.xul
--- a/editor/ui/dialogs/content/EdLabelProps.xul
+++ b/mail/components/compose/content/dialogs/EdLabelProps.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorLabelProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorLabelProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdLabelProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdLabelProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption label="&Settings.label;" accesskey="&Settings.accesskey;"/>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <checkbox id="EditText" label="&EditLabelText.label;" accesskey="&EditLabelText.accesskey;" checked="true" disabled="true"
diff --git a/editor/ui/dialogs/content/EdLinkProps.js b/mail/components/compose/content/dialogs/EdLinkProps.js
copy from editor/ui/dialogs/content/EdLinkProps.js
copy to mail/components/compose/content/dialogs/EdLinkProps.js
diff --git a/editor/ui/dialogs/content/EdLinkProps.xul b/mail/components/compose/content/dialogs/EdLinkProps.xul
copy from editor/ui/dialogs/content/EdLinkProps.xul
copy to mail/components/compose/content/dialogs/EdLinkProps.xul
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mail/components/compose/content/dialogs/EdLinkProps.xul
@@ -2,29 +2,29 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorLinkProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorLinkProperties.dtd">
 
 <dialog id="linkDlg" title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    onload = "Startup()"
    ondialogaccept="return onAccept();"
    ondialogcancel="return onCancel();">
 
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdLinkProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdLinkProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <vbox style="min-width: 20em">
     <groupbox><caption id="linkTextCaption"/>
       <vbox>
         <label id="linkTextMessage" control="linkTextInput"/>
         <textbox id="linkTextInput"/>
diff --git a/editor/ui/dialogs/content/EdListProps.js b/mail/components/compose/content/dialogs/EdListProps.js
copy from editor/ui/dialogs/content/EdListProps.js
copy to mail/components/compose/content/dialogs/EdListProps.js
diff --git a/editor/ui/dialogs/content/EdListProps.xul b/mail/components/compose/content/dialogs/EdListProps.xul
copy from editor/ui/dialogs/content/EdListProps.xul
copy to mail/components/compose/content/dialogs/EdListProps.xul
--- a/editor/ui/dialogs/content/EdListProps.xul
+++ b/mail/components/compose/content/dialogs/EdListProps.xul
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorListProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorListProperties.dtd">
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdListProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdListProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox flex="1"><caption label="&ListType.label;"/>
     <menulist id="ListType" oncommand="SelectListType()">
       <menupopup>
         <menuitem label="&none.value;"/>
         <menuitem value="ul" label="&bulletList.value;"/>
diff --git a/editor/ui/dialogs/content/EdNamedAnchorProps.js b/mail/components/compose/content/dialogs/EdNamedAnchorProps.js
copy from editor/ui/dialogs/content/EdNamedAnchorProps.js
copy to mail/components/compose/content/dialogs/EdNamedAnchorProps.js
diff --git a/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mail/components/compose/content/dialogs/EdNamedAnchorProps.xul
copy from editor/ui/dialogs/content/EdNamedAnchorProps.xul
copy to mail/components/compose/content/dialogs/EdNamedAnchorProps.xul
--- a/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/mail/components/compose/content/dialogs/EdNamedAnchorProps.xul
@@ -2,30 +2,30 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdNamedAnchorProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EdNamedAnchorProperties.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdNamedAnchorProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdNamedAnchorProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label control="nameInput"
          value="&anchorNameEditField.label;"
          accesskey="&anchorNameEditField.accessKey;"/>
   <textbox class="MinWidth20em" id="nameInput" oninput="ChangeName()" 
              tooltiptext="&nameInput.tooltip;"/>
diff --git a/editor/ui/dialogs/content/EdPageProps.js b/mail/components/compose/content/dialogs/EdPageProps.js
copy from editor/ui/dialogs/content/EdPageProps.js
copy to mail/components/compose/content/dialogs/EdPageProps.js
diff --git a/editor/ui/dialogs/content/EdPageProps.xul b/mail/components/compose/content/dialogs/EdPageProps.xul
copy from editor/ui/dialogs/content/EdPageProps.xul
copy to mail/components/compose/content/dialogs/EdPageProps.xul
--- a/editor/ui/dialogs/content/EdPageProps.xul
+++ b/mail/components/compose/content/dialogs/EdPageProps.xul
@@ -2,30 +2,30 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPageProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorPageProperties.dtd">
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdPageProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdPageProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <grid>
     <columns><column flex="1"/><column flex="2"/></columns>
     <rows>
       <row>
         <label value="&location.label;"/>
         <label value="&locationNewPage.label;" id="PageLocation"/>
diff --git a/editor/ui/dialogs/content/EdReplace.js b/mail/components/compose/content/dialogs/EdReplace.js
copy from editor/ui/dialogs/content/EdReplace.js
copy to mail/components/compose/content/dialogs/EdReplace.js
diff --git a/editor/ui/dialogs/content/EdReplace.xul b/mail/components/compose/content/dialogs/EdReplace.xul
copy from editor/ui/dialogs/content/EdReplace.xul
copy to mail/components/compose/content/dialogs/EdReplace.xul
--- a/editor/ui/dialogs/content/EdReplace.xul
+++ b/mail/components/compose/content/dialogs/EdReplace.xul
@@ -2,29 +2,29 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorReplace.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorReplace.dtd">
 
 <dialog id="replaceDlg" title="&replaceDialog.title;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    persist="screenX screenY"
    buttons="cancel"
    onload = "onLoad()"
    ondialogaccept="onFindNext(); return false">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdReplace.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdReplace.js"/>
   <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
 
   <hbox>
     <vbox>
       <spacer class="spacer"/>
       <grid align="start">
         <columns><column/><column/></columns>
         <rows>
diff --git a/editor/ui/dialogs/content/EdSelectProps.js b/mail/components/compose/content/dialogs/EdSelectProps.js
copy from editor/ui/dialogs/content/EdSelectProps.js
copy to mail/components/compose/content/dialogs/EdSelectProps.js
diff --git a/editor/ui/dialogs/content/EdSelectProps.xul b/mail/components/compose/content/dialogs/EdSelectProps.xul
copy from editor/ui/dialogs/content/EdSelectProps.xul
copy to mail/components/compose/content/dialogs/EdSelectProps.xul
--- a/editor/ui/dialogs/content/EdSelectProps.xul
+++ b/mail/components/compose/content/dialogs/EdSelectProps.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorSelectProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorSelectProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdSelectProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdSelectProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <!-- Setting rows="7" on tree isn't working, equalsize vbox sets tree height. -->
   <vbox equalsize="always">
     <tree id="SelectTree" onselect="treeBoxObject.view.selectionChanged();" onkeyup="onTreeKeyUp(event);">
       <treecols id="SelectCols">
         <treecol id="SelectTextCol" flex="3" label="&TextHeader.label;" primary="true"/>
diff --git a/editor/ui/dialogs/content/EdSpellCheck.js b/mail/components/compose/content/dialogs/EdSpellCheck.js
copy from editor/ui/dialogs/content/EdSpellCheck.js
copy to mail/components/compose/content/dialogs/EdSpellCheck.js
--- a/editor/ui/dialogs/content/EdSpellCheck.js
+++ b/mail/components/compose/content/dialogs/EdSpellCheck.js
@@ -356,17 +356,17 @@ function AddToDictionary()
   if (gMisspelledWord) {
     gSpellChecker.AddWordToDictionary(gMisspelledWord);
   }
   NextWord();
 }
 
 function EditDictionary()
 {
-  window.openDialog("chrome://editor/content/EdDictionary.xul", "_blank", "chrome,close,titlebar,modal", "", gMisspelledWord);
+  window.openDialog("chrome://messenger/content/messengercompose/EdDictionary.xul", "_blank", "chrome,close,titlebar,modal", "", gMisspelledWord);
 }
 
 function SelectLanguage()
 {
   var item = gDialog.LanguageMenulist.selectedItem;
   if (item.value != "more-cmd") {
     gSpellChecker.SetCurrentDictionary(item.value);
     // For compose windows we need to set the "lang" attribute so the
diff --git a/editor/ui/dialogs/content/EdSpellCheck.xul b/mail/components/compose/content/dialogs/EdSpellCheck.xul
copy from editor/ui/dialogs/content/EdSpellCheck.xul
copy to mail/components/compose/content/dialogs/EdSpellCheck.xul
--- a/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mail/components/compose/content/dialogs/EdSpellCheck.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?> 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorSpellCheck.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorSpellCheck.dtd">
 
 <!-- dialog containing a control requiring initial setup -->
 <dialog id="spellCheckDlg" buttons="cancel" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     persist="screenX screenY"
     onload = "Startup()"
     ondialogaccept="return doDefault();"
     ondialogcancel="return CancelSpellCheck();">
 
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
   <script src="chrome://communicator/content/utilityOverlay.js"/>
-  <script src="chrome://editor/content/EdSpellCheck.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdSpellCheck.js"/>
   <script src="chrome://global/content/contentAreaUtils.js"/>
 
   <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
   <stringbundle id="regionBundle" src="chrome://global/locale/regionNames.properties"/>
 
   <grid>
     <columns>
       <column class="spell-check"/>
diff --git a/editor/ui/dialogs/content/EdTableProps.js b/mail/components/compose/content/dialogs/EdTableProps.js
copy from editor/ui/dialogs/content/EdTableProps.js
copy to mail/components/compose/content/dialogs/EdTableProps.js
--- a/editor/ui/dialogs/content/EdTableProps.js
+++ b/mail/components/compose/content/dialogs/EdTableProps.js
@@ -421,17 +421,17 @@ function GetColorAndUpdate(ColorWellID)
       colorObj.Type = "Table";
       colorObj.TableColor = gTableColor;
       break;
     case "cellBackgroundCW":
       colorObj.Type = "Cell";
       colorObj.CellColor = gCellColor;
       break;
   }
-  window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", colorObj);
+  window.openDialog("chrome://messenger/content/messengercompose/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", colorObj);
 
   // User canceled the dialog
   if (colorObj.Cancel)
     return;
 
   switch( ColorWellID )
   {
     case "tableBackgroundCW":
diff --git a/editor/ui/dialogs/content/EdTableProps.xul b/mail/components/compose/content/dialogs/EdTableProps.xul
copy from editor/ui/dialogs/content/EdTableProps.xul
copy to mail/components/compose/content/dialogs/EdTableProps.xul
--- a/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mail/components/compose/content/dialogs/EdTableProps.xul
@@ -2,36 +2,36 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorTableProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorTableProperties.dtd">
 
 <dialog title="&tableWindow.title;"
     id="tableDlg"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
     buttons="accept,extra1,cancel"
     buttonlabelclose="&closeButton.label;"
     buttonlabelextra1="&applyButton.label;"
     buttonaccesskeyextra1="&applyButton.accesskey;"
     ondialogaccept="return onAccept();"
     ondialogextra1="return Apply();"
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdTableProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdTableProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="TableTab" label="&tableTab.label;"/>
       <tab id="CellTab" label="&cellTab.label;"/>
     </tabs>
diff --git a/editor/ui/dialogs/content/EdTextAreaProps.js b/mail/components/compose/content/dialogs/EdTextAreaProps.js
copy from editor/ui/dialogs/content/EdTextAreaProps.js
copy to mail/components/compose/content/dialogs/EdTextAreaProps.js
diff --git a/editor/ui/dialogs/content/EdTextAreaProps.xul b/mail/components/compose/content/dialogs/EdTextAreaProps.xul
copy from editor/ui/dialogs/content/EdTextAreaProps.xul
copy to mail/components/compose/content/dialogs/EdTextAreaProps.xul
--- a/editor/ui/dialogs/content/EdTextAreaProps.xul
+++ b/mail/components/compose/content/dialogs/EdTextAreaProps.xul
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://messenger/content/messengercompose/EdDialogOverlay.xul"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorTextAreaProperties.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorTextAreaProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script src="chrome://editor/content/editorUtilities.js"/>
-  <script src="chrome://editor/content/EdDialogCommon.js"/>
-  <script src="chrome://editor/content/EdTextAreaProps.js"/>
+  <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
+  <script src="chrome://messenger/content/messengercompose/EdTextAreaProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><caption label="&Settings.label;"/>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="TextAreaName" value="&TextAreaName.label;" accesskey="&TextAreaName.accessKey;"/>
diff --git a/editor/ui/composer/content/editor.js b/mail/components/compose/content/editor.js
copy from editor/ui/composer/content/editor.js
copy to mail/components/compose/content/editor.js
--- a/editor/ui/composer/content/editor.js
+++ b/mail/components/compose/content/editor.js
@@ -14,18 +14,18 @@ var prefAuthorString = "";
 
 var kDisplayModeNormal = 0;
 var kDisplayModeAllTags = 1;
 var kDisplayModeSource = 2;
 var kDisplayModePreview = 3;
 
 const kDisplayModeMenuIDs = ["viewNormalMode", "viewAllTagsMode", "viewSourceMode", "viewPreviewMode"];
 const kDisplayModeTabIDS = ["NormalModeButton", "TagModeButton", "SourceModeButton", "PreviewModeButton"];
-const kNormalStyleSheet = "chrome://editor/content/EditorContent.css";
-const kAllTagsStyleSheet = "chrome://editor/content/EditorAllTags.css";
+const kNormalStyleSheet = "chrome://messenger/content/messengercompose/EditorContent.css";
+const kAllTagsStyleSheet = "chrome://messenger/content/messengercompose/EditorAllTags.css";
 const kContentEditableStyleSheet = "resource://gre/res/contenteditable.css";
 
 var kTextMimeType = "text/plain";
 var kHTMLMimeType = "text/html";
 var kXHTMLMimeType = "application/xhtml+xml";
 
 var gPreviousNonSourceDisplayMode = 1;
 var gEditorDisplayMode = -1;
@@ -1410,17 +1410,17 @@ function EditorSelectColor(colorType, mo
 
   if (!useLastColor)
   {
     // Avoid the JS warning
     gColorObj.NoDefault = false;
 
     // Launch the ColorPicker dialog
     // TODO: Figure out how to position this under the color buttons on the toolbar
-    window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", gColorObj);
+    window.openDialog("chrome://messenger/content/messengercompose/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", gColorObj);
 
     // User canceled the dialog
     if (gColorObj.Cancel)
       return;
   }
 
   if (gColorObj.Type == "Text")
   {
@@ -2700,17 +2700,17 @@ function IsSelectionInOneCell()
 
 // Call this with insertAllowed = true to allow inserting if not in existing table,
 //   else use false to do nothing if not in a table
 function EditorInsertOrEditTable(insertAllowed)
 {
   if (IsInTable())
   {
     // Edit properties of existing table
-    window.openDialog("chrome://editor/content/EdTableProps.xul", "_blank", "chrome,close,titlebar,modal", "","TablePanel");
+    window.openDialog("chrome://messenger/content/messengercompose/EdTableProps.xul", "_blank", "chrome,close,titlebar,modal", "","TablePanel");
     gContentWindow.focus();
   } 
   else if (insertAllowed)
   {
     try {
       if (GetCurrentEditor().selection.isCollapsed)
         // If we have a caret, insert a blank table...
         EditorInsertTable();
@@ -2719,30 +2719,30 @@ function EditorInsertOrEditTable(insertA
         goDoCommand("cmd_ConvertToTable");
     } catch (e) {}
   }
 }
 
 function EditorInsertTable()
 {
   // Insert a new table
-  window.openDialog("chrome://editor/content/EdInsertTable.xul", "_blank", "chrome,close,titlebar,modal", "");
+  window.openDialog("chrome://messenger/content/messengercompose/EdInsertTable.xul", "_blank", "chrome,close,titlebar,modal", "");
   gContentWindow.focus();
 }
 
 function EditorTableCellProperties()
 {
   if (!IsHTMLEditor())
     return;
 
   try {
     var cell = GetCurrentEditor().getElementOrParentByTagName("td", null);
     if (cell) {
       // Start Table Properties dialog on the "Cell" panel
-      window.openDialog("chrome://editor/content/EdTableProps.xul", "_blank", "chrome,close,titlebar,modal", "", "CellPanel");
+      window.openDialog("chrome://messenger/content/messengercompose/EdTableProps.xul", "_blank", "chrome,close,titlebar,modal", "", "CellPanel");
       gContentWindow.focus();
     }
   } catch (e) {}
 }
 
 function GetNumberOfContiguousSelectedRows()
 {
   if (!IsHTMLEditor())
@@ -2884,17 +2884,17 @@ function EditorFindOrCreateInsertCharWin
     var windowWithDialog = FindEditorWithInsertCharDialog();
     if (windowWithDialog)
     {
       SwitchInsertCharToThisWindow(windowWithDialog);
     }
     else
     {
       // The dialog will set window.InsertCharWindow to itself
-      window.openDialog("chrome://editor/content/EdInsertChars.xul", "_blank", "chrome,close,titlebar", "");
+      window.openDialog("chrome://messenger/content/messengercompose/EdInsertChars.xul", "_blank", "chrome,close,titlebar", "");
     }
   }
 }
 
 // Find another HTML editor window to associate with the InsertChar dialog
 //   or close it if none found  (May be a mail composer)
 function SwitchInsertCharToAnotherEditorOrClose()
 {
@@ -3130,17 +3130,17 @@ function FillInHTMLTooltipEditor(tooltip
       }
     }
   }
   return false;
 }
 
 function UpdateTOC()
 {
-  window.openDialog("chrome://editor/content/EdInsertTOC.xul",
+  window.openDialog("chrome://messenger/content/messengercompose/EdInsertTOC.xul",
                     "_blank", "chrome,close,modal,titlebar");
   window.content.focus();
 }
 
 function InitTOCMenu()
 {
   var elt = GetCurrentEditor().document.getElementById("mozToc");
   var createMenuitem = document.getElementById("insertTOCMenuitem");
diff --git a/mail/components/compose/content/editorOverlay.xul b/mail/components/compose/content/editorOverlay.xul
--- a/mail/components/compose/content/editorOverlay.xul
+++ b/mail/components/compose/content/editorOverlay.xul
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay [
-<!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
+<!ENTITY % editorOverlayDTD SYSTEM "chrome://messenger/locale/messengercompose/editorOverlay.dtd">
 %editorOverlayDTD;
 <!ENTITY % utilityOverlayDTD SYSTEM
   "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityOverlayDTD;
 ]>
 
 <overlay id="editorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script src="chrome://editor/content/editorUtilities.js"/>
-<script src="chrome://editor/content/ComposerCommands.js"/>
+<script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
+<script src="chrome://messenger/content/messengercompose/ComposerCommands.js"/>
 
   <keyset id="editorKeys">
     <key id="boldkb"         key="&styleBoldCmd.key;"       observes="cmd_bold" modifiers="accel"/>
     <key id="italickb"       key="&styleItalicCmd.key;"     observes="cmd_italic" modifiers="accel"/>
     <key id="underlinekb"    key="&styleUnderlineCmd.key;"  observes="cmd_underline" modifiers="accel"/>
     <key id="fixedwidthkb"   key="&fontFixedWidth.key;" observes="cmd_tt" modifiers="accel"/>
 
     <key id="increaseindentkb"  key="&increaseIndent.key;"  observes="cmd_indent"  modifiers="accel"/>
diff --git a/editor/ui/composer/content/editorUtilities.js b/mail/components/compose/content/editorUtilities.js
copy from editor/ui/composer/content/editorUtilities.js
copy to mail/components/compose/content/editorUtilities.js
--- a/editor/ui/composer/content/editorUtilities.js
+++ b/mail/components/compose/content/editorUtilities.js
@@ -42,34 +42,34 @@ function ConfirmWithTitle(title, message
 
 /************* String Utilities ***************/
 
 function GetString(name)
 {
   if (!gStringBundle)
   {
     try {
-      gStringBundle = Services.strings.createBundle("chrome://editor/locale/editor.properties");
+      gStringBundle = Services.strings.createBundle("chrome://messenger/locale/messengercompose/editor.properties");
     } catch (ex) {}
   }
   if (gStringBundle)
   {
     try {
       return gStringBundle.GetStringFromName(name);
     } catch (e) {}
   }
   return null;
 }
 
 function GetFormattedString(aName, aVal)
 {
   if (!gStringBundle)
   {
     try {
-      gStringBundle = Services.strings.createBundle("chrome://editor/locale/editor.properties");
+      gStringBundle = Services.strings.createBundle("chrome://messenger/locale/messengercompose/editor.properties");
     } catch (ex) {}
   }
   if (gStringBundle)
   {
     try {
       return gStringBundle.formatStringFromName(aName, [aVal], 1);
     } catch (e) {}
   }
diff --git a/mail/components/compose/content/messengercompose.xul b/mail/components/compose/content/messengercompose.xul
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -2,17 +2,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgCompSMIMEOverlay.css" type="text/css"?>
-<?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/messengercompose/editorOverlay.xul"?>
 #ifdef XP_MACOSX
 <?xul-overlay href="chrome://messenger/content/macMenuOverlay.xul"?>
 #endif
 <?xul-overlay href="chrome://messenger/content/baseMenuOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/charsetOverlay.xul"?>
 
 <!DOCTYPE window [
   <!ENTITY % messengercomposeDTD SYSTEM "chrome://messenger/locale/messengercompose/messengercompose.dtd" >
@@ -52,17 +52,17 @@
   <stringbundle id="brandBundle"        src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_comp_smime"  src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
 </stringbundleset>
 
 <script src="chrome://global/content/printUtils.js"/>
 <script src="chrome://messenger/content/accountUtils.js"/>
 <script src="chrome://messenger/content/mailCore.js"/>
 <script src="chrome://communicator/content/contentAreaClick.js"/>
-<script src="chrome://editor/content/editor.js"/>
+<script src="chrome://messenger/content/messengercompose/editor.js"/>
 <script src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
 <script src="chrome://messenger/content/messengercompose/bigFileObserver.js"/>
 <script src="chrome://messenger/content/messengercompose/cloudAttachmentLinkManager.js"/>
 
 <!-- drag and drop -->
 <script src="chrome://messenger/content/addressbook/abDragDrop.js"/>
 <script src="chrome://global/content/nsDragAndDrop.js"/>
 
diff --git a/mail/components/compose/jar.mn b/mail/components/compose/jar.mn
--- a/mail/components/compose/jar.mn
+++ b/mail/components/compose/jar.mn
@@ -1,19 +1,85 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
-% overlay chrome://editor/content/EdImageOverlay.xul chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
-% overlay chrome://editor/content/EdImageOverlay.xul chrome://messenger/content/messengercompose/EdImageOverlayOverlay.xul
-% overlay chrome://editor/content/EdColorProps.xul chrome://messenger/content/messengercompose/EdColorPropsOverlay.xul
-% overlay chrome://editor/content/EdLinkProps.xul chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
+% overlay chrome://messenger/content/messengercompose/EdImageOverlay.xul chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
+% overlay chrome://messenger/content/messengercompose/EdImageOverlay.xul chrome://messenger/content/messengercompose/EdImageOverlayOverlay.xul
+% overlay chrome://messenger/content/messengercompose/EdColorProps.xul chrome://messenger/content/messengercompose/EdColorPropsOverlay.xul
+% overlay chrome://messenger/content/messengercompose/EdLinkProps.xul chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
 *   content/messenger/messengercompose/messengercompose.xul        (content/messengercompose.xul)
     content/messenger/messengercompose/MsgComposeCommands.js       (content/MsgComposeCommands.js)
     content/messenger/messengercompose/bigFileObserver.js          (content/bigFileObserver.js)
     content/messenger/messengercompose/cloudAttachmentLinkManager.js (content/cloudAttachmentLinkManager.js)
     content/messenger/messengercompose/EdImageOverlayOverlay.xul   (content/EdImageOverlayOverlay.xul)
     content/messenger/messengercompose/EdColorPropsOverlay.xul     (content/EdColorPropsOverlay.xul)
     content/messenger/messengercompose/addressingWidgetOverlay.js  (content/addressingWidgetOverlay.js)
-
-comm.jar:
-    content/editor/editorOverlay.xul                               (content/editorOverlay.xul)
+    content/messenger/messengercompose/editor.js                   (content/editor.js)
+    content/messenger/messengercompose/editorOverlay.xul           (content/editorOverlay.xul)
+    content/messenger/messengercompose/editorUtilities.js          (content/editorUtilities.js)
+    content/messenger/messengercompose/ComposerCommands.js         (content/ComposerCommands.js)
+    content/messenger/messengercompose/EditorContent.css           (content/EditorContent.css)
+    content/messenger/messengercompose/images/tag-anchor.gif       (content/images/tag-anchor.gif)
+    content/messenger/messengercompose/EdDialogCommon.js           (content/dialogs/EdDialogCommon.js)
+    content/messenger/messengercompose/EdLinkProps.xul             (content/dialogs/EdLinkProps.xul)
+    content/messenger/messengercompose/EdLinkProps.js              (content/dialogs/EdLinkProps.js)
+*   content/messenger/messengercompose/EdImageProps.xul            (content/dialogs/EdImageProps.xul)
+    content/messenger/messengercompose/EdImageProps.js             (content/dialogs/EdImageProps.js)
+    content/messenger/messengercompose/EdImageOverlay.xul          (content/dialogs/EdImageOverlay.xul)
+    content/messenger/messengercompose/EdImageOverlay.js           (content/dialogs/EdImageOverlay.js)
+    content/messenger/messengercompose/EdHLineProps.xul            (content/dialogs/EdHLineProps.xul)
+    content/messenger/messengercompose/EdHLineProps.js             (content/dialogs/EdHLineProps.js)
+    content/messenger/messengercompose/EdReplace.xul               (content/dialogs/EdReplace.xul)
+    content/messenger/messengercompose/EdReplace.js                (content/dialogs/EdReplace.js)
+    content/messenger/messengercompose/EdSpellCheck.xul            (content/dialogs/EdSpellCheck.xul)
+    content/messenger/messengercompose/EdSpellCheck.js             (content/dialogs/EdSpellCheck.js)
+    content/messenger/messengercompose/EdDictionary.xul            (content/dialogs/EdDictionary.xul)
+    content/messenger/messengercompose/EdDictionary.js             (content/dialogs/EdDictionary.js)
+    content/messenger/messengercompose/EdNamedAnchorProps.xul      (content/dialogs/EdNamedAnchorProps.xul)
+    content/messenger/messengercompose/EdNamedAnchorProps.js       (content/dialogs/EdNamedAnchorProps.js)
+    content/messenger/messengercompose/EdInsertTOC.xul             (content/dialogs/EdInsertTOC.xul)
+    content/messenger/messengercompose/EdInsertTOC.js              (content/dialogs/EdInsertTOC.js)
+    content/messenger/messengercompose/EdInsertTable.xul           (content/dialogs/EdInsertTable.xul)
+    content/messenger/messengercompose/EdInsertTable.js            (content/dialogs/EdInsertTable.js)
+    content/messenger/messengercompose/EdInsertMath.xul            (content/dialogs/EdInsertMath.xul)
+    content/messenger/messengercompose/EdInsertMath.js             (content/dialogs/EdInsertMath.js)
+    content/messenger/messengercompose/EdTableProps.xul            (content/dialogs/EdTableProps.xul)
+    content/messenger/messengercompose/EdTableProps.js             (content/dialogs/EdTableProps.js)
+    content/messenger/messengercompose/EdFormProps.xul             (content/dialogs/EdFormProps.xul)
+    content/messenger/messengercompose/EdFormProps.js              (content/dialogs/EdFormProps.js)
+    content/messenger/messengercompose/EdInputProps.xul            (content/dialogs/EdInputProps.xul)
+    content/messenger/messengercompose/EdInputProps.js             (content/dialogs/EdInputProps.js)
+*   content/messenger/messengercompose/EdInputImage.xul            (content/dialogs/EdInputImage.xul)
+    content/messenger/messengercompose/EdInputImage.js             (content/dialogs/EdInputImage.js)
+    content/messenger/messengercompose/EdTextAreaProps.xul         (content/dialogs/EdTextAreaProps.xul)
+    content/messenger/messengercompose/EdTextAreaProps.js          (content/dialogs/EdTextAreaProps.js)
+    content/messenger/messengercompose/EdSelectProps.xul           (content/dialogs/EdSelectProps.xul)
+    content/messenger/messengercompose/EdSelectProps.js            (content/dialogs/EdSelectProps.js)
+    content/messenger/messengercompose/EdButtonProps.xul           (content/dialogs/EdButtonProps.xul)
+    content/messenger/messengercompose/EdButtonProps.js            (content/dialogs/EdButtonProps.js)
+    content/messenger/messengercompose/EdLabelProps.xul            (content/dialogs/EdLabelProps.xul)
+    content/messenger/messengercompose/EdLabelProps.js             (content/dialogs/EdLabelProps.js)
+    content/messenger/messengercompose/EdFieldSetProps.xul         (content/dialogs/EdFieldSetProps.xul)
+    content/messenger/messengercompose/EdFieldSetProps.js          (content/dialogs/EdFieldSetProps.js)
+    content/messenger/messengercompose/EdInsSrc.xul                (content/dialogs/EdInsSrc.xul)
+    content/messenger/messengercompose/EdInsSrc.js                 (content/dialogs/EdInsSrc.js)
+    content/messenger/messengercompose/EdInsertChars.xul           (content/dialogs/EdInsertChars.xul)
+    content/messenger/messengercompose/EdInsertChars.js            (content/dialogs/EdInsertChars.js)
+    content/messenger/messengercompose/EdDialogOverlay.xul         (content/dialogs/EdDialogOverlay.xul)
+    content/messenger/messengercompose/EdAdvancedEdit.xul          (content/dialogs/EdAdvancedEdit.xul)
+    content/messenger/messengercompose/EdAdvancedEdit.js           (content/dialogs/EdAdvancedEdit.js)
+    content/messenger/messengercompose/EdListProps.xul             (content/dialogs/EdListProps.xul)
+    content/messenger/messengercompose/EdListProps.js              (content/dialogs/EdListProps.js)
+    content/messenger/messengercompose/EdPageProps.xul             (content/dialogs/EdPageProps.xul)
+    content/messenger/messengercompose/EdPageProps.js              (content/dialogs/EdPageProps.js)
+    content/messenger/messengercompose/EdColorProps.xul            (content/dialogs/EdColorProps.xul)
+    content/messenger/messengercompose/EdColorProps.js             (content/dialogs/EdColorProps.js)
+    content/messenger/messengercompose/EdColorPicker.xul           (content/dialogs/EdColorPicker.xul)
+    content/messenger/messengercompose/EdColorPicker.js            (content/dialogs/EdColorPicker.js)
+    content/messenger/messengercompose/EdAECSSAttributes.js        (content/dialogs/EdAECSSAttributes.js)
+    content/messenger/messengercompose/EdAEHTMLAttributes.js       (content/dialogs/EdAEHTMLAttributes.js)
+    content/messenger/messengercompose/EdAEJSEAttributes.js        (content/dialogs/EdAEJSEAttributes.js)
+    content/messenger/messengercompose/EdAEAttributes.js           (content/dialogs/EdAEAttributes.js)
+    content/messenger/messengercompose/EdConvertToTable.xul        (content/dialogs/EdConvertToTable.xul)
+    content/messenger/messengercompose/EdConvertToTable.js         (content/dialogs/EdConvertToTable.js)
+    content/messenger/messengercompose/TeXZilla.js                 (texzilla/TeXZilla.js)
diff --git a/mail/components/compose/moz.build b/mail/components/compose/moz.build
--- a/mail/components/compose/moz.build
+++ b/mail/components/compose/moz.build
@@ -1,8 +1,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
 
+EXTRA_JS_MODULES += [
+    'editorUtilities.js',
+]
+
+JS_PREFERENCE_PP_FILES += [
+    'composer.js'
+]
+
 DEFINES['TOOLKIT_DIR'] = "%s/toolkit" % (CONFIG['moztopsrcdir'],)
diff --git a/editor/ui/texzilla/content/TeXZilla.js b/mail/components/compose/texzilla/TeXZilla.js
copy from editor/ui/texzilla/content/TeXZilla.js
copy to mail/components/compose/texzilla/TeXZilla.js
diff --git a/mail/components/preferences/compose.xul b/mail/components/preferences/compose.xul
--- a/mail/components/preferences/compose.xul
+++ b/mail/components/preferences/compose.xul
@@ -2,17 +2,17 @@
 <!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
    - This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % composeDTD SYSTEM "chrome://messenger/locale/preferences/compose.dtd">
-<!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
+<!ENTITY % editorOverlayDTD SYSTEM "chrome://messenger/locale/messengercompose/editorOverlay.dtd">
 %brandDTD;
 %composeDTD;
 %editorOverlayDTD;
 ]>
 
 <overlay id="ComposePaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -78,17 +78,16 @@ libs-%: AB_CD=$*
 libs-%:
 # merge if we're not en-US. Conditional function because
 # we need the current value of AB_CD.
 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*  XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
-	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 package-win32-installer: $(SUBMAKEFILES)
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EdAdvancedEdit.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EdAdvancedEdit.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EdAdvancedEdit.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EdAdvancedEdit.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EdColorPicker.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EdColorPicker.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EdColorPicker.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EdColorPicker.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EdConvertToTable.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EdConvertToTable.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EdConvertToTable.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EdConvertToTable.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EdDialogOverlay.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EdDialogOverlay.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EdDialogOverlay.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EdDialogOverlay.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EdNamedAnchorProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EdNamedAnchorProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EdNamedAnchorProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EdNamedAnchorProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorButtonProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorButtonProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorButtonProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorButtonProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorColorProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorColorProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorColorProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorColorProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorFieldSetProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorFieldSetProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorFieldSetProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorFieldSetProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorFormProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorFormProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorFormProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorFormProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorHLineProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorHLineProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorHLineProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorHLineProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorImageProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorImageProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorImageProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorImageProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorInputProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorInputProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorInputProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorInputProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorInsertChars.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertChars.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorInsertChars.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertChars.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorInsertMath.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertMath.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorInsertMath.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertMath.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorInsertSource.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertSource.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorInsertSource.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertSource.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorInsertTOC.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertTOC.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorInsertTOC.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertTOC.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorInsertTable.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertTable.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorInsertTable.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorInsertTable.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorLabelProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorLabelProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorLabelProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorLabelProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorLinkProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorLinkProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorLinkProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorLinkProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorListProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorListProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorListProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorListProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorPersonalDictionary.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorPersonalDictionary.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorPersonalDictionary.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorPersonalDictionary.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorReplace.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorReplace.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorReplace.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorReplace.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorSelectProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorSelectProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorSelectProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorSelectProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorSpellCheck.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorSpellCheck.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorSpellCheck.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorSpellCheck.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorTableProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorTableProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorTableProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorTableProperties.dtd
diff --git a/editor/ui/locales/en-US/chrome/dialogs/EditorTextAreaProperties.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/EditorTextAreaProperties.dtd
copy from editor/ui/locales/en-US/chrome/dialogs/EditorTextAreaProperties.dtd
copy to mail/locales/en-US/chrome/messenger/messengercompose/EditorTextAreaProperties.dtd
diff --git a/mail/locales/filter.py b/mail/locales/filter.py
--- a/mail/locales/filter.py
+++ b/mail/locales/filter.py
@@ -1,14 +1,14 @@
 def test(mod, path, entity=None):
   import re
   # ignore anything but Thunderbird
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "devtools/shared", "devtools/client",
-                 "mail", "chat", "editor/ui", "extensions/spellcheck",
+                 "mail", "chat", "extensions/spellcheck",
                  "other-licenses/branding/thunderbird",
                  "mail/branding/thunderbird"):
     return "ignore"
 
   # ignore MOZ_LANGPACK_CONTRIBUTORS
   if mod == "mail" and path == "defines.inc" and \
      entity == "MOZ_LANGPACK_CONTRIBUTORS":
     return "ignore"
diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -145,16 +145,45 @@
   locale/@AB_CD@/messenger/messengercompose/messengercompose.dtd        (%chrome/messenger/messengercompose/messengercompose.dtd)
   locale/@AB_CD@/messenger/messengercompose/addressingWidgetOverlay.dtd (%chrome/messenger/messengercompose/addressingWidgetOverlay.dtd)
   locale/@AB_CD@/messenger/messengercompose/askSendFormat.dtd           (%chrome/messenger/messengercompose/askSendFormat.dtd)
   locale/@AB_CD@/messenger/messengercompose/askSendFormat.properties    (%chrome/messenger/messengercompose/askSendFormat.properties)
   locale/@AB_CD@/messenger/messengercompose/sendProgress.dtd            (%chrome/messenger/messengercompose/sendProgress.dtd)
   locale/@AB_CD@/messenger/messengercompose/sendProgress.properties     (%chrome/messenger/messengercompose/sendProgress.properties)
   locale/@AB_CD@/messenger/messengercompose/composeMsgs.properties      (%chrome/messenger/messengercompose/composeMsgs.properties)
   locale/@AB_CD@/messenger/messengercompose/mailComposeEditorOverlay.dtd (%chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd)
+  locale/@AB_CD@/messenger/messengercompose/editorSmileyOverlay.dtd     (%chrome/messenger/messengercompose/editorSmileyOverlay.dtd)
+  locale/@AB_CD@/messenger/messengercompose/editorOverlay.dtd           (%chrome/messenger/messengercompose/editorOverlay.dtd)
+  locale/@AB_CD@/messenger/messengercompose/editor.properties           (%chrome/messenger/messengercompose/editor.properties)
+  locale/@AB_CD@/messenger/messengercompose/EditorHLineProperties.dtd   (%chrome/messenger/messengercompose/EditorHLineProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorImageProperties.dtd   (%chrome/messenger/messengercompose/EditorImageProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorInsertSource.dtd      (%chrome/messenger/messengercompose/EditorInsertSource.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorInsertMath.dtd        (%chrome/messenger/messengercompose/EditorInsertMath.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorInsertChars.dtd       (%chrome/messenger/messengercompose/EditorInsertChars.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorInsertTable.dtd       (%chrome/messenger/messengercompose/EditorInsertTable.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorInsertTOC.dtd         (%chrome/messenger/messengercompose/EditorInsertTOC.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorLinkProperties.dtd    (%chrome/messenger/messengercompose/EditorLinkProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorListProperties.dtd    (%chrome/messenger/messengercompose/EditorListProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorColorProperties.dtd   (%chrome/messenger/messengercompose/EditorColorProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EdColorPicker.dtd           (%chrome/messenger/messengercompose/EdColorPicker.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorReplace.dtd           (%chrome/messenger/messengercompose/EditorReplace.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorSpellCheck.dtd        (%chrome/messenger/messengercompose/EditorSpellCheck.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorPersonalDictionary.dtd (%chrome/messenger/messengercompose/EditorPersonalDictionary.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorTableProperties.dtd   (%chrome/messenger/messengercompose/EditorTableProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorFormProperties.dtd    (%chrome/messenger/messengercompose/EditorFormProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorInputProperties.dtd   (%chrome/messenger/messengercompose/EditorInputProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorTextAreaProperties.dtd (%chrome/messenger/messengercompose/EditorTextAreaProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorSelectProperties.dtd  (%chrome/messenger/messengercompose/EditorSelectProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorButtonProperties.dtd  (%chrome/messenger/messengercompose/EditorButtonProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorLabelProperties.dtd   (%chrome/messenger/messengercompose/EditorLabelProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EditorFieldSetProperties.dtd (%chrome/messenger/messengercompose/EditorFieldSetProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EdNamedAnchorProperties.dtd (%chrome/messenger/messengercompose/EdNamedAnchorProperties.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EdDialogOverlay.dtd         (%chrome/messenger/messengercompose/EdDialogOverlay.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EdAdvancedEdit.dtd          (%chrome/messenger/messengercompose/EdAdvancedEdit.dtd)
+  locale/@AB_CD@/messenger/messengercompose/EdConvertToTable.dtd        (%chrome/messenger/messengercompose/EdConvertToTable.dtd)
   locale/@AB_CD@/messenger/preferences/preferences.dtd                  (%chrome/messenger/preferences/preferences.dtd)
   locale/@AB_CD@/messenger/preferences/general.dtd                      (%chrome/messenger/preferences/general.dtd)
   #ifdef XP_MACOSX
   locale/@AB_CD@/messenger/preferences/dockoptions.dtd                  (%chrome/messenger/preferences/dockoptions.dtd)
   #endif
   locale/@AB_CD@/messenger/preferences/display.dtd                      (%chrome/messenger/preferences/display.dtd)
   locale/@AB_CD@/messenger/preferences/colors.dtd                       (%chrome/messenger/preferences/colors.dtd)
   locale/@AB_CD@/messenger/preferences/chat.dtd                         (%chrome/messenger/preferences/chat.dtd)
diff --git a/mail/locales/l10n-beta.ini b/mail/locales/l10n-beta.ini
--- a/mail/locales/l10n-beta.ini
+++ b/mail/locales/l10n-beta.ini
@@ -2,17 +2,16 @@
 depth = ../..
 all = mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
     mail/branding/thunderbird
-    editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 devtools_client = mozilla/devtools/client/locales/l10n.ini
 
 [include_toolkit]
diff --git a/mail/locales/l10n-central.ini b/mail/locales/l10n-central.ini
--- a/mail/locales/l10n-central.ini
+++ b/mail/locales/l10n-central.ini
@@ -2,17 +2,16 @@
 depth = ../..
 all = mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
     mail/branding/thunderbird
-    editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 devtools_client = mozilla/devtools/client/locales/l10n.ini
 
 [include_toolkit]
diff --git a/mail/locales/l10n.ini b/mail/locales/l10n.ini
--- a/mail/locales/l10n.ini
+++ b/mail/locales/l10n.ini
@@ -2,16 +2,15 @@
 depth = ../..
 all = mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
     mail/branding/thunderbird
-    editor/ui
 
 [includes]
 # include toolkit from mozilla.
 # Don't specify which, use l10n-central.ini and friends if you're
 # not working on a local check-out
 toolkit = mozilla/toolkit/locales/l10n.ini
 devtools_client = mozilla/devtools/client/locales/l10n.ini