--- a/editor/ui/jar.mn
+++ b/editor/ui/jar.mn
@@ -1,30 +1,27 @@
 # 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/.
 
 comm.jar:
 % content editor %content/editor/
+#ifdef MOZ_SUITE
 % overlay chrome://communicator/content/tasksOverlay.xul chrome://editor/content/editorTasksOverlay.xul
 % overlay chrome://messenger/content/mailWindowOverlay.xul chrome://editor/content/editorMailOverlay.xul
-#ifdef MOZ_SUITE
 % overlay chrome://communicator/content/pref/preferences.xul chrome://editor/content/editorPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-appearance.xul chrome://editor/content/editorPrefsOverlay.xul
 % overlay chrome://navigator/content/navigatorOverlay.xul chrome://editor/content/editorNavigatorOverlay.xul
 % content editor-region %content/editor-region/
 #endif
       content/editor/editor.js                                 (composer/content/editor.js) 
       content/editor/editorUtilities.js                        (composer/content/editorUtilities.js) 
       content/editor/ComposerCommands.js                       (composer/content/ComposerCommands.js) 
       content/editor/EditorContent.css                         (composer/content/EditorContent.css)  
       content/editor/editorSmileyOverlay.xul                   (composer/content/editorSmileyOverlay.xul) 
-      content/editor/editorNavigatorOverlay.xul                (composer/content/editorNavigatorOverlay.xul) 
-      content/editor/editorMailOverlay.xul                     (composer/content/editorMailOverlay.xul) 
-      content/editor/editorTasksOverlay.xul                    (composer/content/editorTasksOverlay.xul) 
       content/editor/editorApplicationOverlay.js               (composer/content/editorApplicationOverlay.js) 
       content/editor/images/tag-anchor.gif                     (composer/content/images/tag-anchor.gif)
       content/editor/EdDialogCommon.js                         (dialogs/content/EdDialogCommon.js) 
       content/editor/EdLinkProps.xul                           (dialogs/content/EdLinkProps.xul) 
       content/editor/EdLinkProps.js                            (dialogs/content/EdLinkProps.js) 
       content/editor/EdImageProps.xul                          (dialogs/content/EdImageProps.xul) 
       content/editor/EdImageProps.js                           (dialogs/content/EdImageProps.js) 
       content/editor/EdImageOverlay.xul                        (dialogs/content/EdImageOverlay.xul) 
@@ -86,16 +83,19 @@ comm.jar:
       content/editor/EdConvertToTable.js                       (dialogs/content/EdConvertToTable.js) 
 #ifdef MOZ_SUITE
       content/editor/editor.xul                                (composer/content/editor.xul)
       content/editor/editingOverlay.js                         (composer/content/editingOverlay.js)
       content/editor/publishprefs.js                           (composer/content/publishprefs.js)
       content/editor/EditorContextMenu.js                      (composer/content/EditorContextMenu.js)
       content/editor/EditorContextMenuOverlay.xul              (composer/content/EditorContextMenuOverlay.xul)
       content/editor/EditorAllTags.css                         (composer/content/EditorAllTags.css)
+      content/editor/editorNavigatorOverlay.xul                (composer/content/editorNavigatorOverlay.xul) 
+      content/editor/editorMailOverlay.xul                     (composer/content/editorMailOverlay.xul) 
+      content/editor/editorTasksOverlay.xul                    (composer/content/editorTasksOverlay.xul) 
       content/editor/editorOverlay.xul                         (composer/content/editorOverlay.xul) 
       content/editor/editingOverlay.xul                        (composer/content/editingOverlay.xul)
       content/editor/composerOverlay.xul                       (composer/content/composerOverlay.xul)
       content/editor/pref-toolbars.xul                         (composer/content/pref-toolbars.xul)
       content/editor/pref-editing.xul                          (composer/content/pref-editing.xul)
       content/editor/pref-editing.js                           (composer/content/pref-editing.js)
       content/editor/pref-composer.xul                         (composer/content/pref-composer.xul)
       content/editor/editorPrefsOverlay.xul                    (composer/content/editorPrefsOverlay.xul)