Bug 390262: Disentangle SeaMonkey and Thunderbird UI; r=Neil, sr=bienvenu
authorKarsten Düsterloh <mnyromyr@tprac.de>
Sun, 12 Apr 2009 02:31:07 +0200
changeset 2373 87feec86594872550c39e83dc3acb0c94e1b2808
parent 2372 39818eecd89706d7e844813842a68234259d8628
child 2374 0fd0ff623ec3dd634dfe2b1727e153d4df9b6cc8
push idunknown
push userunknown
push dateunknown
reviewersNeil, bienvenu
bugs390262
Bug 390262: Disentangle SeaMonkey and Thunderbird UI; r=Neil, sr=bienvenu
mail/base/content/SearchDialog.js
mail/base/content/threadPane.js
mail/base/jar.mn
mail/extensions/Makefile.in
mail/extensions/mailviews/Makefile.in
mail/extensions/mailviews/content/mailViewList.js
mail/extensions/mailviews/content/mailViewList.xul
mail/extensions/mailviews/content/mailViewSetup.js
mail/extensions/mailviews/content/mailViewSetup.xul
mail/extensions/mailviews/content/msgViewPickerOverlay.js
mail/extensions/mailviews/jar.mn
mail/makefiles.sh
mailnews/addrbook/prefs/resources/content/pref-addressing.js
mailnews/addrbook/prefs/resources/content/pref-addressing.xul
mailnews/addrbook/resources/content/abCardOverlay.js
mailnews/addrbook/resources/content/abCardViewOverlay.js
mailnews/addrbook/resources/content/abCommon.js
mailnews/addrbook/resources/content/abEditListDialog.xul
mailnews/addrbook/resources/content/abMailListDialog.xul
mailnews/addrbook/resources/content/addressbook.js
mailnews/addrbook/resources/content/addressbook.xul
mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
mailnews/base/prefs/resources/content/pref-character_encoding.js
mailnews/base/prefs/resources/content/pref-character_encoding.xul
mailnews/base/prefs/resources/content/pref-junk.js
mailnews/base/prefs/resources/content/pref-junk.xul
mailnews/base/prefs/resources/content/pref-mailnews.js
mailnews/base/prefs/resources/content/pref-mailnews.xul
mailnews/base/prefs/resources/content/pref-notifications.js
mailnews/base/prefs/resources/content/pref-notifications.xul
mailnews/base/prefs/resources/content/pref-offline.js
mailnews/base/prefs/resources/content/pref-offline.xul
mailnews/base/prefs/resources/content/pref-receipts.js
mailnews/base/prefs/resources/content/pref-receipts.xul
mailnews/base/prefs/resources/content/pref-tags.js
mailnews/base/prefs/resources/content/pref-tags.xul
mailnews/base/prefs/resources/content/pref-viewing_messages.js
mailnews/base/prefs/resources/content/pref-viewing_messages.xul
mailnews/base/resources/content/commandglue.js
mailnews/base/resources/content/folderPane.xul
mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
mailnews/base/resources/content/mail-offline.js
mailnews/base/resources/content/mail3PaneWindowCommands.js
mailnews/base/resources/content/mailABOverlay.xul
mailnews/base/resources/content/mailCommands.js
mailnews/base/resources/content/mailContextMenus.js
mailnews/base/resources/content/mailEditorOverlay.xul
mailnews/base/resources/content/mailMessengerComposeOverlay.xul
mailnews/base/resources/content/mailMessengerOverlay.xul
mailnews/base/resources/content/mailOverlay.xul
mailnews/base/resources/content/mailTasksOverlay.js
mailnews/base/resources/content/mailTasksOverlay.xul
mailnews/base/resources/content/mailWindow.js
mailnews/base/resources/content/mailWindowOverlay.js
mailnews/base/resources/content/mailWindowOverlay.xul
mailnews/base/resources/content/messageWindow.js
mailnews/base/resources/content/messageWindow.xul
mailnews/base/resources/content/messenger.css
mailnews/base/resources/content/messenger.xul
mailnews/base/resources/content/msgFolderPickerOverlay.xul
mailnews/base/resources/content/msgHdrViewOverlay.js
mailnews/base/resources/content/msgHdrViewOverlay.xul
mailnews/base/resources/content/msgMail3PaneWindow.js
mailnews/base/resources/content/msgPrintEngine.xul
mailnews/base/resources/content/msgSelectOffline.xul
mailnews/base/resources/content/phishingDetector.js
mailnews/base/resources/content/searchBar.js
mailnews/base/resources/content/subscribe.js
mailnews/base/resources/content/subscribe.xul
mailnews/base/resources/content/threadPane.js
mailnews/base/resources/content/threadPane.xul
mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
mailnews/base/resources/content/widgetglue.js
mailnews/base/resources/content/win/platformMailnewsOverlay.xul
mailnews/base/search/resources/content/ABSearchDialog.js
mailnews/base/search/resources/content/ABSearchDialog.xul
mailnews/base/search/resources/content/FilterListDialog.js
mailnews/base/search/resources/content/FilterListDialog.xul
mailnews/base/search/resources/content/SearchDialog.js
mailnews/base/search/resources/content/SearchDialog.xul
mailnews/compose/prefs/resources/content/pref-composing_messages.js
mailnews/compose/prefs/resources/content/pref-composing_messages.xul
mailnews/compose/prefs/resources/content/pref-formatting.js
mailnews/compose/prefs/resources/content/pref-formatting.xul
mailnews/compose/resources/content/MsgComposeCommands.js
mailnews/compose/resources/content/addressingWidgetOverlay.js
mailnews/compose/resources/content/addressingWidgetOverlay.xul
mailnews/compose/resources/content/mailComposeExtrasOverlay.xul
mailnews/compose/resources/content/messengercompose.xul
mailnews/extensions/mailviews/jar.mn
mailnews/extensions/mailviews/resources/content/mailViewList.js
mailnews/extensions/mailviews/resources/content/mailViewList.xul
mailnews/extensions/mailviews/resources/content/mailViewSetup.js
mailnews/extensions/mailviews/resources/content/mailViewSetup.xul
mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.js
mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.xul
mailnews/jar.mn
suite/mailnews/addrbook/abCardOverlay.js
suite/mailnews/addrbook/abCardViewOverlay.js
suite/mailnews/addrbook/abCommon.js
suite/mailnews/addrbook/abEditListDialog.xul
suite/mailnews/addrbook/abMailListDialog.xul
suite/mailnews/addrbook/addressbook.js
suite/mailnews/addrbook/addressbook.xul
suite/mailnews/addrbook/prefs/pref-addressing.js
suite/mailnews/addrbook/prefs/pref-addressing.xul
suite/mailnews/commandglue.js
suite/mailnews/compose/MsgComposeCommands.js
suite/mailnews/compose/addressingWidgetOverlay.js
suite/mailnews/compose/addressingWidgetOverlay.xul
suite/mailnews/compose/mailComposeExtrasOverlay.xul
suite/mailnews/compose/messengercompose.xul
suite/mailnews/compose/prefs/pref-composing_messages.js
suite/mailnews/compose/prefs/pref-composing_messages.xul
suite/mailnews/compose/prefs/pref-formatting.js
suite/mailnews/compose/prefs/pref-formatting.xul
suite/mailnews/folderPane.xul
suite/mailnews/jar.mn
suite/mailnews/mac/platformMailnewsOverlay.xul
suite/mailnews/mail-offline.js
suite/mailnews/mail3PaneWindowCommands.js
suite/mailnews/mailABOverlay.xul
suite/mailnews/mailCommands.js
suite/mailnews/mailContextMenus.js
suite/mailnews/mailEditorOverlay.xul
suite/mailnews/mailMessengerComposeOverlay.xul
suite/mailnews/mailMessengerOverlay.xul
suite/mailnews/mailOverlay.xul
suite/mailnews/mailTasksOverlay.js
suite/mailnews/mailTasksOverlay.xul
suite/mailnews/mailViewList.js
suite/mailnews/mailViewList.xul
suite/mailnews/mailViewSetup.js
suite/mailnews/mailViewSetup.xul
suite/mailnews/mailWindow.js
suite/mailnews/mailWindowOverlay.js
suite/mailnews/mailWindowOverlay.xul
suite/mailnews/messageWindow.js
suite/mailnews/messageWindow.xul
suite/mailnews/messenger.css
suite/mailnews/messenger.xul
suite/mailnews/msgFolderPickerOverlay.xul
suite/mailnews/msgHdrViewOverlay.js
suite/mailnews/msgHdrViewOverlay.xul
suite/mailnews/msgMail3PaneWindow.js
suite/mailnews/msgPrintEngine.xul
suite/mailnews/msgSelectOffline.xul
suite/mailnews/msgViewPickerOverlay.js
suite/mailnews/msgViewPickerOverlay.xul
suite/mailnews/phishingDetector.js
suite/mailnews/prefs/mailPrefsOverlay.xul
suite/mailnews/prefs/pref-character_encoding.js
suite/mailnews/prefs/pref-character_encoding.xul
suite/mailnews/prefs/pref-junk.js
suite/mailnews/prefs/pref-junk.xul
suite/mailnews/prefs/pref-mailnews.js
suite/mailnews/prefs/pref-mailnews.xul
suite/mailnews/prefs/pref-notifications.js
suite/mailnews/prefs/pref-notifications.xul
suite/mailnews/prefs/pref-offline.js
suite/mailnews/prefs/pref-offline.xul
suite/mailnews/prefs/pref-receipts.js
suite/mailnews/prefs/pref-receipts.xul
suite/mailnews/prefs/pref-tags.js
suite/mailnews/prefs/pref-tags.xul
suite/mailnews/prefs/pref-viewing_messages.js
suite/mailnews/prefs/pref-viewing_messages.xul
suite/mailnews/search/ABSearchDialog.js
suite/mailnews/search/ABSearchDialog.xul
suite/mailnews/search/FilterListDialog.js
suite/mailnews/search/FilterListDialog.xul
suite/mailnews/search/SearchDialog.js
suite/mailnews/search/SearchDialog.xul
suite/mailnews/searchBar.js
suite/mailnews/subscribe.js
suite/mailnews/subscribe.xul
suite/mailnews/threadPane.js
suite/mailnews/threadPane.xul
suite/mailnews/unix/platformMailnewsOverlay.xul
suite/mailnews/widgetglue.js
suite/mailnews/win/platformMailnewsOverlay.xul
rename from mailnews/base/search/resources/content/SearchDialog.js
rename to mail/base/content/SearchDialog.js
rename from mailnews/base/resources/content/threadPane.js
rename to mail/base/content/threadPane.js
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -28,16 +28,17 @@ messenger.jar:
 *   content/messenger/editContactOverlay.xul        (content/editContactOverlay.xul)
 *   content/messenger/msgMail3PaneWindow.js         (content/msgMail3PaneWindow.js)
 *   content/messenger/mail3PaneWindowCommands.js    (content/mail3PaneWindowCommands.js)
 *   content/messenger/mailCommands.js               (content/mailCommands.js)
 *   content/messenger/mailCore.js                   (content/mailCore.js)
 *   content/messenger/commandglue.js                (content/commandglue.js)
 *   content/messenger/widgetglue.js                 (content/widgetglue.js)
 *   content/messenger/SearchDialog.xul              (content/SearchDialog.xul)
+    content/messenger/SearchDialog.js               (content/SearchDialog.js)
 *   content/messenger/ABSearchDialog.xul            (content/ABSearchDialog.xul)
 *   content/messenger/ABSearchDialog.js             (content/ABSearchDialog.js)
 *   content/messenger/FilterListDialog.xul          (content/FilterListDialog.xul)
 *   content/messenger/FilterListDialog.js           (content/FilterListDialog.js)
     content/messenger/specialTabs.js                (content/specialTabs.js)
 *   content/messenger/subscribe.xul                 (content/subscribe.xul)
     content/messenger/subscribe.js                  (content/subscribe.js)
 *   content/messenger/aboutDialog.xul               (content/aboutDialog.xul)
@@ -57,72 +58,17 @@ messenger.jar:
     content/messenger/messenger.css                 (content/messenger.css)
 *   content/messenger/search.xml                    (content/search.xml)
 *   content/messenger/tabmail.xml                   (content/tabmail.xml)
 *   content/messenger/newmailalert.xul              (content/newmailalert.xul)
     content/messenger/newmailalert.js               (content/newmailalert.js)
 *   content/messenger/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
 *   content/messenger/configEditorOverlay.xul       (content/configEditorOverlay.xul)
     content/messenger/composerOverlay.css           (content/composerOverlay.css)
-    content/messenger/msgSynchronize.xul            (/mailnews/base/resources/content/msgSynchronize.xul)
-    content/messenger/msgSynchronize.js             (/mailnews/base/resources/content/msgSynchronize.js)
-    content/messenger/folderProps.xul               (/mailnews/base/resources/content/folderProps.xul)
-    content/messenger/retention.js                  (/mailnews/base/resources/content/retention.js)
-    content/messenger/folderProps.js                (/mailnews/base/resources/content/folderProps.js)
-    content/messenger/folderWidgets.xml             (/mailnews/base/resources/content/folderWidgets.xml)
-    content/messenger/threadPane.js                 (/mailnews/base/resources/content/threadPane.js)
-    content/messenger/shareglue.js                  (/mailnews/base/resources/content/shareglue.js)
-    content/messenger/msgFolderPickerOverlay.js     (/mailnews/base/resources/content/msgFolderPickerOverlay.js)
-    content/messenger/newFolderDialog.xul           (/mailnews/base/resources/content/newFolderDialog.xul)
-    content/messenger/newFolderDialog.js            (/mailnews/base/resources/content/newFolderDialog.js)
-    content/messenger/newTagDialog.xul              (/mailnews/base/resources/content/newTagDialog.xul)
-    content/messenger/newTagDialog.js               (/mailnews/base/resources/content/newTagDialog.js)
-    content/messenger/msgViewNavigation.js          (/mailnews/base/resources/content/msgViewNavigation.js)
-    content/messenger/msgAccountCentral.xul         (/mailnews/base/resources/content/msgAccountCentral.xul)
-    content/messenger/msgAccountCentral.js          (/mailnews/base/resources/content/msgAccountCentral.js)
-    content/messenger/renameFolderDialog.xul        (/mailnews/base/resources/content/renameFolderDialog.xul)
-    content/messenger/renameFolderDialog.js         (/mailnews/base/resources/content/renameFolderDialog.js)
-    content/messenger/virtualFolderProperties.xul   (/mailnews/base/resources/content/virtualFolderProperties.xul)
-    content/messenger/virtualFolderProperties.js    (/mailnews/base/resources/content/virtualFolderProperties.js)
-    content/messenger/virtualFolderListDialog.xul   (/mailnews/base/resources/content/virtualFolderListDialog.xul)
-    content/messenger/virtualFolderListDialog.js    (/mailnews/base/resources/content/virtualFolderListDialog.js)
-    content/messenger/messengerdnd.js               (/mailnews/base/resources/content/messengerdnd.js)
-    content/messenger/msgPrintEngine.js             (/mailnews/base/resources/content/msgPrintEngine.js)
-*   content/messenger/junkMailInfo.xul              (/mailnews/base/resources/content/junkMailInfo.xul)
-    content/messenger/junkCommands.js               (/mailnews/base/resources/content/junkCommands.js)
-    content/messenger/SearchDialog.js               (/mailnews/base/search/resources/content/SearchDialog.js)
-    content/messenger/searchTermOverlay.js          (/mailnews/base/search/resources/content/searchTermOverlay.js)
-    content/messenger/searchTermOverlay.xul         (/mailnews/base/search/resources/content/searchTermOverlay.xul)
-    content/messenger/CustomHeaders.xul             (/mailnews/base/search/resources/content/CustomHeaders.xul)
-    content/messenger/CustomHeaders.js              (/mailnews/base/search/resources/content/CustomHeaders.js)
-    content/messenger/FilterEditor.xul              (/mailnews/base/search/resources/content/FilterEditor.xul)
-    content/messenger/FilterEditor.js               (/mailnews/base/search/resources/content/FilterEditor.js)
-*   content/messenger/searchWidgets.xml             (/mailnews/base/search/resources/content/searchWidgets.xml)
-    content/messenger/viewLog.xul                   (/mailnews/base/search/resources/content/viewLog.xul)
-    content/messenger/viewLog.js                    (/mailnews/base/search/resources/content/viewLog.js)
-    content/messenger/junkLog.xul                   (/mailnews/base/resources/content/junkLog.xul)
-    content/messenger/junkLog.js                    (/mailnews/base/resources/content/junkLog.js)
-*   content/messenger/importDialog.js               (/mailnews/import/resources/content/importDialog.js)
-*   content/messenger/importDialog.xul              (/mailnews/import/resources/content/importDialog.xul)
-    content/messenger/fieldMapImport.xul            (/mailnews/import/resources/content/fieldMapImport.xul)
-    content/messenger/fieldMapImport.js             (/mailnews/import/resources/content/fieldMapImport.js)
-    content/messenger/downloadheaders.js            (/mailnews/news/resources/content/downloadheaders.js)
-    content/messenger/downloadheaders.xul           (/mailnews/news/resources/content/downloadheaders.xul)
-    content/messenger/markByDate.js                 (/mailnews/base/resources/content/markByDate.js)
-    content/messenger/markByDate.xul                (/mailnews/base/resources/content/markByDate.xul)
-    content/messenger/dateFormat.js                 (/mailnews/base/resources/content/dateFormat.js)
-    content/messenger/msgViewPickerOverlay.js       (/mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.js)
-    content/messenger/mailViewSetup.js              (/mailnews/extensions/mailviews/resources/content/mailViewSetup.js)
-    content/messenger/mailViewSetup.xul             (/mailnews/extensions/mailviews/resources/content/mailViewSetup.xul)
-    content/messenger/mailViewList.xul              (/mailnews/extensions/mailviews/resources/content/mailViewList.xul)
-    content/messenger/mailViewList.js               (/mailnews/extensions/mailviews/resources/content/mailViewList.js)
-    content/messenger/am-mdn.xul                    (/mailnews/extensions/mdn/resources/content/am-mdn.xul)
-    content/messenger/am-mdn.js                     (/mailnews/extensions/mdn/resources/content/am-mdn.js)
-    content/messenger/shutdownWindow.xul            (/mailnews/base/resources/content/shutdownWindow.xul)
-    content/messenger/shutdownWindow.js             (/mailnews/base/resources/content/shutdownWindow.js)
+    content/messenger/threadPane.js                 (content/threadPane.js)
 #ifdef XP_MACOSX
     content/messenger/macMenuOverlay.xul            (content/macMenuOverlay.xul)
 #endif
 *   content/messenger/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
 *   content/messenger/customizeToolbarSheet.js      (content/customizeToolbarSheet.js)
 #endif
 
--- a/mail/extensions/Makefile.in
+++ b/mail/extensions/Makefile.in
@@ -15,16 +15,17 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#   Karsten Düsterloh <mnyromyr@tprac.de>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
@@ -37,17 +38,17 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = $(NULL)
+DIRS = mailviews
 
 ifdef MOZ_PSM
 BUILD_SMIME=1
 endif
 
 ifdef BUILD_SMIME
 DIRS		+= smime
 endif
new file mode 100644
--- /dev/null
+++ b/mail/extensions/mailviews/Makefile.in
@@ -0,0 +1,45 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+#   Karsten Düsterloh <mnyromyr@tprac.de>
+# Portions created by the Initial Developer are Copyright (C) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
rename from mailnews/extensions/mailviews/resources/content/mailViewList.js
rename to mail/extensions/mailviews/content/mailViewList.js
rename from mailnews/extensions/mailviews/resources/content/mailViewList.xul
rename to mail/extensions/mailviews/content/mailViewList.xul
rename from mailnews/extensions/mailviews/resources/content/mailViewSetup.js
rename to mail/extensions/mailviews/content/mailViewSetup.js
rename from mailnews/extensions/mailviews/resources/content/mailViewSetup.xul
rename to mail/extensions/mailviews/content/mailViewSetup.xul
rename from mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.js
rename to mail/extensions/mailviews/content/msgViewPickerOverlay.js
new file mode 100644
--- /dev/null
+++ b/mail/extensions/mailviews/jar.mn
@@ -0,0 +1,6 @@
+messenger.jar:
+    content/messenger/msgViewPickerOverlay.js    (content/msgViewPickerOverlay.js)
+    content/messenger/mailViewSetup.js           (content/mailViewSetup.js)
+    content/messenger/mailViewSetup.xul          (content/mailViewSetup.xul)
+    content/messenger/mailViewList.xul           (content/mailViewList.xul)
+    content/messenger/mailViewList.js            (content/mailViewList.js)
--- a/mail/makefiles.sh
+++ b/mail/makefiles.sh
@@ -48,16 +48,17 @@ mail/components/Makefile
 mail/components/compose/Makefile
 mail/components/addrbook/Makefile
 mail/components/preferences/Makefile
 mail/components/build/Makefile
 mail/components/shell/Makefile
 mail/components/shell/public/Makefile
 mail/components/phishing/Makefile
 mail/extensions/Makefile
+mail/extensions/mailviews/Makefile
 mail/extensions/smime/Makefile
 mail/installer/Makefile
 mail/installer/windows/Makefile
 mail/themes/Makefile
 mail/themes/pinstripe/Makefile
 mail/themes/qute/Makefile
 mail/themes/gnomestripe/Makefile
 "
deleted file mode 100644
--- a/mailnews/extensions/mailviews/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef MOZ_SUITE
-messenger.jar:
-% overlay chrome://messenger/content/mailWindowOverlay.xul chrome://messenger/content/msgViewPickerOverlay.xul
-    content/messenger/msgViewPickerOverlay.xul                       (resources/content/msgViewPickerOverlay.xul)
-    content/messenger/msgViewPickerOverlay.js                        (resources/content/msgViewPickerOverlay.js)
-    content/messenger/mailViewSetup.js                               (resources/content/mailViewSetup.js)
-    content/messenger/mailViewSetup.xul                              (resources/content/mailViewSetup.xul)
-    content/messenger/mailViewList.xul                               (resources/content/mailViewList.xul)
-    content/messenger/mailViewList.js                                (resources/content/mailViewList.js)
-#endif
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -1,226 +1,105 @@
-#ifdef MOZ_SUITE
 messenger.jar:
-% content messagebody %content/messagebody/ contentaccessible=yes
-% content messenger %content/messenger/ xpcnativewrappers=yes
-% override chrome://messagebody/skin/messageBody.css chrome://messenger/skin/messageBody.css
-% content messenger-region %content/messenger-region/
-% overlay chrome://communicator/content/pref/preferences.xul                   chrome://messenger/content/mailPrefsOverlay.xul
-% overlay chrome://communicator/content/pref/pref-appearance.xul               chrome://messenger/content/mailPrefsOverlay.xul
-% overlay chrome://communicator/content/pref/pref-scripts.xul                  chrome://messenger/content/mailPrefsOverlay.xul
-% overlay chrome://communicator/content/pref/pref-cookies.xul                  chrome://messenger/content/mailPrefsOverlay.xul
-% overlay chrome://editor/content/editorTasksOverlay.xul                       chrome://messenger/content/mailTasksOverlay.xul
-% overlay chrome://navigator/content/navigatorOverlay.xul                      chrome://messenger/content/mailOverlay.xul
-% overlay chrome://messenger/content/messenger.xul                             chrome://messenger/content/mailMessengerOverlay.xul
-% overlay chrome://messenger/content/messengercompose/messengercompose.xul     chrome://messenger/content/mailMessengerComposeOverlay.xul
-% overlay chrome://messenger/content/addressbook/addressbook.xul               chrome://messenger/content/mailABOverlay.xul
-% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul   chrome://messenger/content/mailOverlay.xul
-% overlay chrome://editor/content/editor.xul                                   chrome://messenger/content/mailEditorOverlay.xul
-% overlay chrome://editor/content/EdImageOverlay.xul                           chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
-% overlay chrome://editor/content/EdLinkProps.xul                              chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
-    content/messenger/addressbook/pref-addressing.js                           (addrbook/prefs/resources/content/pref-addressing.js)
-    content/messenger/addressbook/pref-addressing.xul                          (addrbook/prefs/resources/content/pref-addressing.xul)
     content/messenger/addressbook/pref-directory-add.js                        (addrbook/prefs/resources/content/pref-directory-add.js)
     content/messenger/addressbook/pref-directory-add.xul                       (addrbook/prefs/resources/content/pref-directory-add.xul)
     content/messenger/addressbook/pref-editdirectories.js                      (addrbook/prefs/resources/content/pref-editdirectories.js)
     content/messenger/addressbook/pref-editdirectories.xul                     (addrbook/prefs/resources/content/pref-editdirectories.xul)
     content/messenger/addressbook/abAddressBookNameDialog.js                   (addrbook/resources/content/abAddressBookNameDialog.js)
     content/messenger/addressbook/abAddressBookNameDialog.xul                  (addrbook/resources/content/abAddressBookNameDialog.xul)
-    content/messenger/addressbook/abCardOverlay.js                             (addrbook/resources/content/abCardOverlay.js)
     content/messenger/addressbook/abCardOverlay.xul                            (addrbook/resources/content/abCardOverlay.xul)
-    content/messenger/addressbook/abCardViewOverlay.js                         (addrbook/resources/content/abCardViewOverlay.js)
     content/messenger/addressbook/abCardViewOverlay.xul                        (addrbook/resources/content/abCardViewOverlay.xul)
-    content/messenger/addressbook/abCommon.js                                  (addrbook/resources/content/abCommon.js)
     content/messenger/addressbook/abDirTreeOverlay.xul                         (addrbook/resources/content/abDirTreeOverlay.xul)
     content/messenger/addressbook/abEditCardDialog.xul                         (addrbook/resources/content/abEditCardDialog.xul)
     content/messenger/addressbook/abNewCardDialog.xul                          (addrbook/resources/content/abNewCardDialog.xul)
     content/messenger/addressbook/abResultsPaneOverlay.xul                     (addrbook/resources/content/abResultsPaneOverlay.xul)
     content/messenger/addressbook/abResultsPane.js                             (addrbook/resources/content/abResultsPane.js)
     content/messenger/addressbook/abSelectAddressesDialog.js                   (addrbook/resources/content/abSelectAddressesDialog.js)
     content/messenger/addressbook/abSelectAddressesDialog.xul                  (addrbook/resources/content/abSelectAddressesDialog.xul)
     content/messenger/addressbook/addrbookWidgets.xml                          (addrbook/resources/content/addrbookWidgets.xml)
-    content/messenger/addressbook/addressbook.js                               (addrbook/resources/content/addressbook.js)
-    content/messenger/addressbook/addressbook.xul                              (addrbook/resources/content/addressbook.xul)
     content/messenger/addressbook/abDragDrop.js                                (addrbook/resources/content/abDragDrop.js)
-    content/messenger/addressbook/abMailListDialog.xul                         (addrbook/resources/content/abMailListDialog.xul)
     content/messenger/addressbook/abMailListDialog.js                          (addrbook/resources/content/abMailListDialog.js)
     content/messenger/addressbook/abListOverlay.xul                            (addrbook/resources/content/abListOverlay.xul)
-    content/messenger/addressbook/abEditListDialog.xul                         (addrbook/resources/content/abEditListDialog.xul)
     content/messenger/addressbook/addressbook-panel.xul                        (addrbook/resources/content/addressbook-panel.xul)
     content/messenger/addressbook/addressbook-panel.js                         (addrbook/resources/content/addressbook-panel.js)
     content/messagebody/addressbook/print.css                                  (addrbook/resources/content/print.css)
 *   content/messenger/AccountManager.xul                                       (base/prefs/resources/content/AccountManager.xul)
     content/messenger/AccountManager.js                                        (base/prefs/resources/content/AccountManager.js)
     content/messenger/am-main.xul                                              (base/prefs/resources/content/am-main.xul)
     content/messenger/am-main.js                                               (base/prefs/resources/content/am-main.js)
     content/messenger/am-help.js                                               (base/prefs/resources/content/am-help.js)
     content/messenger/am-server.xul                                            (base/prefs/resources/content/am-server.xul)
     content/messenger/am-serverwithnoidentities.xul                            (base/prefs/resources/content/am-serverwithnoidentities.xul)
     content/messenger/am-serverwithnoidentities.js                             (base/prefs/resources/content/am-serverwithnoidentities.js)
     content/messenger/am-server.js                                             (base/prefs/resources/content/am-server.js)
     content/messenger/am-server-top.xul                                        (base/prefs/resources/content/am-server-top.xul)
     content/messenger/am-copies.xul                                            (base/prefs/resources/content/am-copies.xul)
     content/messenger/am-copies.js                                             (base/prefs/resources/content/am-copies.js)
     content/messenger/am-junk.xul                                              (base/prefs/resources/content/am-junk.xul)
-    content/messenger/am-junk.js                                               (base/prefs/resources/content/am-junk.js)    
+    content/messenger/am-junk.js                                               (base/prefs/resources/content/am-junk.js)
     content/messenger/am-offline.xul                                           (base/prefs/resources/content/am-offline.xul)
     content/messenger/am-offline.js                                            (base/prefs/resources/content/am-offline.js)
     content/messenger/am-addressing.xul                                        (base/prefs/resources/content/am-addressing.xul)
 *   content/messenger/am-addressingOverlay.xul                                 (base/prefs/resources/content/am-addressingOverlay.xul)
     content/messenger/am-addressing.js                                         (base/prefs/resources/content/am-addressing.js)
     content/messenger/am-server-advanced.xul                                   (base/prefs/resources/content/am-server-advanced.xul)
     content/messenger/am-server-advanced.js                                    (base/prefs/resources/content/am-server-advanced.js)
     content/messenger/am-smtp.xul                                              (base/prefs/resources/content/am-smtp.xul)
     content/messenger/am-smtp.js                                               (base/prefs/resources/content/am-smtp.js)
     content/messenger/am-prefs.js                                              (base/prefs/resources/content/am-prefs.js)
     content/messenger/am-identities-list.js                                    (base/prefs/resources/content/am-identities-list.js)
     content/messenger/am-identities-list.xul                                   (base/prefs/resources/content/am-identities-list.xul)
 *   content/messenger/am-identity-edit.js                                      (base/prefs/resources/content/am-identity-edit.js)
     content/messenger/am-identity-edit.xul                                     (base/prefs/resources/content/am-identity-edit.xul)
     content/messenger/am-copiesOverlay.xul                                     (base/prefs/resources/content/am-copiesOverlay.xul)
-    content/messenger/pref-mailnews.xul                                        (base/prefs/resources/content/pref-mailnews.xul)
-    content/messenger/pref-mailnews.js                                         (base/prefs/resources/content/pref-mailnews.js)
-    content/messenger/pref-notifications.xul                                   (base/prefs/resources/content/pref-notifications.xul)
-    content/messenger/pref-notifications.js                                    (base/prefs/resources/content/pref-notifications.js)
-    content/messenger/pref-junk.xul                                            (base/prefs/resources/content/pref-junk.xul)
-    content/messenger/pref-junk.js                                             (base/prefs/resources/content/pref-junk.js)
-    content/messenger/pref-tags.xul                                            (base/prefs/resources/content/pref-tags.xul)
-    content/messenger/pref-tags.js                                             (base/prefs/resources/content/pref-tags.js)
-    content/messenger/pref-viewing_messages.xul                                (base/prefs/resources/content/pref-viewing_messages.xul)
-    content/messenger/pref-viewing_messages.js                                 (base/prefs/resources/content/pref-viewing_messages.js)
-    content/messenger/pref-receipts.xul                                        (base/prefs/resources/content/pref-receipts.xul)
-    content/messenger/pref-receipts.js                                         (base/prefs/resources/content/pref-receipts.js)
-    content/messenger/pref-character_encoding.xul                              (base/prefs/resources/content/pref-character_encoding.xul)
-    content/messenger/pref-character_encoding.js                               (base/prefs/resources/content/pref-character_encoding.js)
-    content/messenger/pref-offline.xul                                         (base/prefs/resources/content/pref-offline.xul)
-    content/messenger/pref-offline.js                                          (base/prefs/resources/content/pref-offline.js)
 *   content/messenger/AccountWizard.xul                                        (base/prefs/resources/content/AccountWizard.xul)
     content/messenger/AccountWizard.js                                         (base/prefs/resources/content/AccountWizard.js)
     content/messenger/aw-accounttype.js                                        (base/prefs/resources/content/aw-accounttype.js)
     content/messenger/aw-identity.js                                           (base/prefs/resources/content/aw-identity.js)
     content/messenger/aw-server.js                                             (base/prefs/resources/content/aw-server.js)
     content/messenger/aw-login.js                                              (base/prefs/resources/content/aw-login.js)
     content/messenger/aw-accname.js                                            (base/prefs/resources/content/aw-accname.js)
     content/messenger/aw-done.js                                               (base/prefs/resources/content/aw-done.js)
     content/messenger/accountUtils.js                                          (base/prefs/resources/content/accountUtils.js)
     content/messenger/amUtils.js                                               (base/prefs/resources/content/amUtils.js)
     content/messenger/ispUtils.js                                              (base/prefs/resources/content/ispUtils.js)
     content/messenger/SmtpServerEdit.xul                                       (base/prefs/resources/content/SmtpServerEdit.xul)
     content/messenger/SmtpServerEdit.js                                        (base/prefs/resources/content/SmtpServerEdit.js)
     content/messenger/smtpEditOverlay.xul                                      (base/prefs/resources/content/smtpEditOverlay.xul)
     content/messenger/smtpEditOverlay.js                                       (base/prefs/resources/content/smtpEditOverlay.js)
-    content/messenger/mailPrefsOverlay.xul                                     (base/prefs/resources/content/mailPrefsOverlay.xul)
-    content/messenger/messenger.css                                            (base/resources/content/messenger.css)
-    content/messenger/messenger.xul                                            (base/resources/content/messenger.xul)
-    content/messenger/mailWindowOverlay.xul                                    (base/resources/content/mailWindowOverlay.xul)
-    content/messenger/mailWindowOverlay.js                                     (base/resources/content/mailWindowOverlay.js)
     content/messenger/msgSynchronize.xul                                       (base/resources/content/msgSynchronize.xul)
     content/messenger/msgSynchronize.js                                        (base/resources/content/msgSynchronize.js)
-    content/messenger/msgSelectOffline.xul                                     (base/resources/content/msgSelectOffline.xul)
-    content/messenger/mailWindow.js                                            (base/resources/content/mailWindow.js)
-    content/messenger/messageWindow.xul                                        (base/resources/content/messageWindow.xul)
-    content/messenger/messageWindow.js                                         (base/resources/content/messageWindow.js)
-    content/messenger/folderPane.xul                                           (base/resources/content/folderPane.xul)
     content/messenger/folderProps.xul                                          (base/resources/content/folderProps.xul)
     content/messenger/folderProps.js                                           (base/resources/content/folderProps.js)
     content/messenger/folderWidgets.xml                                        (base/resources/content/folderWidgets.xml)
-    content/messenger/threadPane.xul                                           (base/resources/content/threadPane.xul)
-    content/messenger/threadPane.js                                            (base/resources/content/threadPane.js)
-    content/messenger/msgHdrViewOverlay.xul                                    (base/resources/content/msgHdrViewOverlay.xul)
-    content/messenger/msgHdrViewOverlay.js                                     (base/resources/content/msgHdrViewOverlay.js)
-    content/messenger/widgetglue.js                                            (base/resources/content/widgetglue.js)
     content/messenger/retention.js                                             (base/resources/content/retention.js)
-    content/messenger/commandglue.js                                           (base/resources/content/commandglue.js)
-    content/messenger/mailCommands.js                                          (base/resources/content/mailCommands.js)
     content/messenger/shareglue.js                                             (base/resources/content/shareglue.js)
-    content/messenger/subscribe.xul                                            (base/resources/content/subscribe.xul)
-    content/messenger/subscribe.js                                             (base/resources/content/subscribe.js)
     content/messenger/newFolderDialog.xul                                      (base/resources/content/newFolderDialog.xul)
     content/messenger/newFolderDialog.js                                       (base/resources/content/newFolderDialog.js)
     content/messenger/msgViewNavigation.js                                     (base/resources/content/msgViewNavigation.js)
-    content/messenger/msgMail3PaneWindow.js                                    (base/resources/content/msgMail3PaneWindow.js)
-    content/messenger/searchBar.js                                             (base/resources/content/searchBar.js)
     content/messenger/msgAccountCentral.xul                                    (base/resources/content/msgAccountCentral.xul)
     content/messenger/msgAccountCentral.js                                     (base/resources/content/msgAccountCentral.js)
-    content/messenger/mail3PaneWindowCommands.js                               (base/resources/content/mail3PaneWindowCommands.js)
     content/messenger/msgFolderPickerOverlay.js                                (base/resources/content/msgFolderPickerOverlay.js)
-    content/messenger/msgFolderPickerOverlay.xul                               (base/resources/content/msgFolderPickerOverlay.xul)
     content/messenger/renameFolderDialog.xul                                   (base/resources/content/renameFolderDialog.xul)
     content/messenger/renameFolderDialog.js                                    (base/resources/content/renameFolderDialog.js)
     content/messenger/virtualFolderProperties.xul                              (base/resources/content/virtualFolderProperties.xul)
     content/messenger/virtualFolderProperties.js                               (base/resources/content/virtualFolderProperties.js)
     content/messenger/virtualFolderListDialog.xul                              (base/resources/content/virtualFolderListDialog.xul)
     content/messenger/virtualFolderListDialog.js                               (base/resources/content/virtualFolderListDialog.js)
     content/messenger/messengerdnd.js                                          (base/resources/content/messengerdnd.js)
-    content/messenger/mailContextMenus.js                                      (base/resources/content/mailContextMenus.js)
     content/messenger/msgPrintEngine.js                                        (base/resources/content/msgPrintEngine.js)
-    content/messenger/msgPrintEngine.xul                                       (base/resources/content/msgPrintEngine.xul)
-    content/messenger/mailTasksOverlay.xul                                     (base/resources/content/mailTasksOverlay.xul)
-    content/messenger/mailTasksOverlay.js                                      (base/resources/content/mailTasksOverlay.js)
-    content/messenger/mailEditorOverlay.xul                                    (base/resources/content/mailEditorOverlay.xul)
-    content/messenger/mailABOverlay.xul                                        (base/resources/content/mailABOverlay.xul)
-    content/messenger/mailMessengerOverlay.xul                                 (base/resources/content/mailMessengerOverlay.xul)
-    content/messenger/mailMessengerComposeOverlay.xul                          (base/resources/content/mailMessengerComposeOverlay.xul)
-    content/messenger/mailOverlay.xul                                          (base/resources/content/mailOverlay.xul)
 *   content/messenger/junkMailInfo.xul                                         (base/resources/content/junkMailInfo.xul)
-    content/messenger/phishingDetector.js                                      (base/resources/content/phishingDetector.js)
     content/messenger/junkCommands.js                                          (base/resources/content/junkCommands.js)
-    content/messenger/SearchDialog.xul                                         (base/search/resources/content/SearchDialog.xul)
-    content/messenger/ABSearchDialog.xul                                       (base/search/resources/content/ABSearchDialog.xul)
-    content/messenger/SearchDialog.js                                          (base/search/resources/content/SearchDialog.js)
-    content/messenger/ABSearchDialog.js                                        (base/search/resources/content/ABSearchDialog.js)
-    content/messenger/searchTermOverlay.js                                     (base/search/resources/content/searchTermOverlay.js)
-    content/messenger/searchTermOverlay.xul                                    (base/search/resources/content/searchTermOverlay.xul)
-    content/messenger/FilterListDialog.xul                                     (base/search/resources/content/FilterListDialog.xul)
-    content/messenger/FilterListDialog.js                                      (base/search/resources/content/FilterListDialog.js)
-    content/messenger/CustomHeaders.xul                                        (base/search/resources/content/CustomHeaders.xul)
-    content/messenger/CustomHeaders.js                                         (base/search/resources/content/CustomHeaders.js)
-    content/messenger/FilterEditor.xul                                         (base/search/resources/content/FilterEditor.xul)
-    content/messenger/FilterEditor.js                                          (base/search/resources/content/FilterEditor.js)
-    content/messenger/searchWidgets.xml                                        (base/search/resources/content/searchWidgets.xml)
-    content/messenger/mail-offline.js                                          (base/resources/content/mail-offline.js)
-    content/messenger/viewLog.xul                                              (base/search/resources/content/viewLog.xul)
-    content/messenger/viewLog.js                                               (base/search/resources/content/viewLog.js)
     content/messenger/junkLog.xul                                              (base/resources/content/junkLog.xul)
     content/messenger/junkLog.js                                               (base/resources/content/junkLog.js)
-    content/messenger/messengercompose/pref-composing_messages.xul             (compose/prefs/resources/content/pref-composing_messages.xul)
-    content/messenger/messengercompose/pref-composing_messages.js              (compose/prefs/resources/content/pref-composing_messages.js)
-    content/messenger/messengercompose/pref-formatting.xul                     (compose/prefs/resources/content/pref-formatting.xul)
-    content/messenger/messengercompose/pref-formatting.js                      (compose/prefs/resources/content/pref-formatting.js)
-    content/messenger/messengercompose/messengercompose.xul                    (compose/resources/content/messengercompose.xul)
-    content/messenger/messengercompose/MsgComposeCommands.js                   (compose/resources/content/MsgComposeCommands.js)
-    content/messenger/messengercompose/addressingWidgetOverlay.js              (compose/resources/content/addressingWidgetOverlay.js)
-    content/messenger/messengercompose/addressingWidgetOverlay.xul             (compose/resources/content/addressingWidgetOverlay.xul)
-    content/messenger/messengercompose/askSendFormat.js                        (compose/resources/content/askSendFormat.js)
-    content/messenger/messengercompose/askSendFormat.xul                       (compose/resources/content/askSendFormat.xul)
-    content/messenger/messengercompose/sendProgress.xul                        (compose/resources/content/sendProgress.xul)
-    content/messenger/messengercompose/sendProgress.js                         (compose/resources/content/sendProgress.js)
-    content/messenger/messengercompose/MsgAttachPage.xul                       (compose/resources/content/MsgAttachPage.xul)
-    content/messenger/messengercompose/MsgAttachPage.js                        (compose/resources/content/MsgAttachPage.js)
-    content/messenger/messengercompose/mailComposeExtrasOverlay.xul            (compose/resources/content/mailComposeExtrasOverlay.xul)
     content/messenger/messengercompose/mailComposeEditorOverlay.xul            (compose/resources/content/mailComposeEditorOverlay.xul)
 *   content/messenger/importDialog.js                                          (import/resources/content/importDialog.js)
 *   content/messenger/importDialog.xul                                         (import/resources/content/importDialog.xul)
     content/messenger/fieldMapImport.xul                                       (import/resources/content/fieldMapImport.xul)
     content/messenger/fieldMapImport.js                                        (import/resources/content/fieldMapImport.js)
     content/messenger/downloadheaders.js                                       (news/resources/content/downloadheaders.js)
     content/messenger/downloadheaders.xul                                      (news/resources/content/downloadheaders.xul)
     content/messenger/markByDate.js                                            (base/resources/content/markByDate.js)
     content/messenger/markByDate.xul                                           (base/resources/content/markByDate.xul)
     content/messenger/dateFormat.js                                            (base/resources/content/dateFormat.js)
     content/messenger/start.xhtml                                              (base/resources/content/start.xhtml)
     content/messenger/shutdownWindow.xul                                       (base/resources/content/shutdownWindow.xul)
     content/messenger/shutdownWindow.js                                        (base/resources/content/shutdownWindow.js)
-#ifdef XP_MACOSX
-    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/mac/platformMailnewsOverlay.xul)
-#else
-#ifdef XP_WIN32
-    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/win/platformMailnewsOverlay.xul)
-#else
-#ifdef XP_OS2
-    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/win/platformMailnewsOverlay.xul)
-#else
-    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/unix/platformMailnewsOverlay.xul)
-#endif
-#endif
-#endif
-#endif
rename from mailnews/addrbook/resources/content/abCardOverlay.js
rename to suite/mailnews/addrbook/abCardOverlay.js
rename from mailnews/addrbook/resources/content/abCardViewOverlay.js
rename to suite/mailnews/addrbook/abCardViewOverlay.js
rename from mailnews/addrbook/resources/content/abCommon.js
rename to suite/mailnews/addrbook/abCommon.js
rename from mailnews/addrbook/resources/content/abEditListDialog.xul
rename to suite/mailnews/addrbook/abEditListDialog.xul
rename from mailnews/addrbook/resources/content/abMailListDialog.xul
rename to suite/mailnews/addrbook/abMailListDialog.xul
rename from mailnews/addrbook/resources/content/addressbook.js
rename to suite/mailnews/addrbook/addressbook.js
rename from mailnews/addrbook/resources/content/addressbook.xul
rename to suite/mailnews/addrbook/addressbook.xul
rename from mailnews/addrbook/prefs/resources/content/pref-addressing.js
rename to suite/mailnews/addrbook/prefs/pref-addressing.js
rename from mailnews/addrbook/prefs/resources/content/pref-addressing.xul
rename to suite/mailnews/addrbook/prefs/pref-addressing.xul
rename from mailnews/base/resources/content/commandglue.js
rename to suite/mailnews/commandglue.js
rename from mailnews/compose/resources/content/MsgComposeCommands.js
rename to suite/mailnews/compose/MsgComposeCommands.js
rename from mailnews/compose/resources/content/addressingWidgetOverlay.js
rename to suite/mailnews/compose/addressingWidgetOverlay.js
rename from mailnews/compose/resources/content/addressingWidgetOverlay.xul
rename to suite/mailnews/compose/addressingWidgetOverlay.xul
rename from mailnews/compose/resources/content/mailComposeExtrasOverlay.xul
rename to suite/mailnews/compose/mailComposeExtrasOverlay.xul
rename from mailnews/compose/resources/content/messengercompose.xul
rename to suite/mailnews/compose/messengercompose.xul
rename from mailnews/compose/prefs/resources/content/pref-composing_messages.js
rename to suite/mailnews/compose/prefs/pref-composing_messages.js
rename from mailnews/compose/prefs/resources/content/pref-composing_messages.xul
rename to suite/mailnews/compose/prefs/pref-composing_messages.xul
rename from mailnews/compose/prefs/resources/content/pref-formatting.js
rename to suite/mailnews/compose/prefs/pref-formatting.js
rename from mailnews/compose/prefs/resources/content/pref-formatting.xul
rename to suite/mailnews/compose/prefs/pref-formatting.xul
rename from mailnews/base/resources/content/folderPane.xul
rename to suite/mailnews/folderPane.xul
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -1,2 +1,112 @@
 messenger.jar:
-   content/messenger/mailWidgets.xml
+% content messagebody %content/messagebody/ contentaccessible=yes
+% content messenger %content/messenger/ xpcnativewrappers=yes
+% override chrome://messagebody/skin/messageBody.css chrome://messenger/skin/messageBody.css
+% content messenger-region %content/messenger-region/
+% overlay chrome://communicator/content/pref/preferences.xul                   chrome://messenger/content/mailPrefsOverlay.xul
+% overlay chrome://communicator/content/pref/pref-appearance.xul               chrome://messenger/content/mailPrefsOverlay.xul
+% overlay chrome://communicator/content/pref/pref-scripts.xul                  chrome://messenger/content/mailPrefsOverlay.xul
+% overlay chrome://communicator/content/pref/pref-cookies.xul                  chrome://messenger/content/mailPrefsOverlay.xul
+% overlay chrome://editor/content/editorTasksOverlay.xul                       chrome://messenger/content/mailTasksOverlay.xul
+% overlay chrome://navigator/content/navigatorOverlay.xul                      chrome://messenger/content/mailOverlay.xul
+% overlay chrome://messenger/content/messenger.xul                             chrome://messenger/content/mailMessengerOverlay.xul
+% overlay chrome://messenger/content/messengercompose/messengercompose.xul     chrome://messenger/content/mailMessengerComposeOverlay.xul
+% overlay chrome://messenger/content/addressbook/addressbook.xul               chrome://messenger/content/mailABOverlay.xul
+% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul   chrome://messenger/content/mailOverlay.xul
+% overlay chrome://editor/content/editor.xul                                   chrome://messenger/content/mailEditorOverlay.xul
+% overlay chrome://editor/content/EdImageOverlay.xul                           chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
+% overlay chrome://editor/content/EdLinkProps.xul                              chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
+% overlay chrome://messenger/content/mailWindowOverlay.xul                     chrome://messenger/content/msgViewPickerOverlay.xul
+    content/messenger/msgViewPickerOverlay.xul
+    content/messenger/msgViewPickerOverlay.js
+    content/messenger/mailViewSetup.js
+    content/messenger/mailViewSetup.xul
+    content/messenger/mailViewList.xul
+    content/messenger/mailViewList.js
+    content/messenger/mailWidgets.xml
+    content/messenger/messenger.css
+    content/messenger/messenger.xul
+    content/messenger/mailWindowOverlay.xul
+    content/messenger/mailWindowOverlay.js
+    content/messenger/msgSelectOffline.xul
+    content/messenger/mailWindow.js
+    content/messenger/messageWindow.xul
+    content/messenger/messageWindow.js
+    content/messenger/folderPane.xul
+    content/messenger/threadPane.xul
+    content/messenger/threadPane.js
+    content/messenger/msgHdrViewOverlay.xul
+    content/messenger/msgHdrViewOverlay.js
+    content/messenger/widgetglue.js
+    content/messenger/commandglue.js
+    content/messenger/mailCommands.js
+    content/messenger/subscribe.xul
+    content/messenger/subscribe.js
+    content/messenger/msgMail3PaneWindow.js
+    content/messenger/searchBar.js
+    content/messenger/mail3PaneWindowCommands.js
+    content/messenger/msgPrintEngine.xul
+    content/messenger/mailTasksOverlay.xul
+    content/messenger/mailTasksOverlay.js
+    content/messenger/mailEditorOverlay.xul
+    content/messenger/mailABOverlay.xul
+    content/messenger/mailMessengerOverlay.xul
+    content/messenger/mailMessengerComposeOverlay.xul
+    content/messenger/phishingDetector.js
+    content/messenger/mailOverlay.xul
+    content/messenger/mail-offline.js
+    content/messenger/mailContextMenus.js
+    content/messenger/msgFolderPickerOverlay.xul
+    content/messenger/mailPrefsOverlay.xul                                     (prefs/mailPrefsOverlay.xul)
+    content/messenger/pref-mailnews.xul                                        (prefs/pref-mailnews.xul)
+    content/messenger/pref-mailnews.js                                         (prefs/pref-mailnews.js)
+    content/messenger/pref-notifications.xul                                   (prefs/pref-notifications.xul)
+    content/messenger/pref-notifications.js                                    (prefs/pref-notifications.js)
+    content/messenger/pref-junk.xul                                            (prefs/pref-junk.xul)
+    content/messenger/pref-junk.js                                             (prefs/pref-junk.js)
+    content/messenger/pref-tags.xul                                            (prefs/pref-tags.xul)
+    content/messenger/pref-tags.js                                             (prefs/pref-tags.js)
+    content/messenger/pref-viewing_messages.xul                                (prefs/pref-viewing_messages.xul)
+    content/messenger/pref-viewing_messages.js                                 (prefs/pref-viewing_messages.js)
+    content/messenger/pref-receipts.xul                                        (prefs/pref-receipts.xul)
+    content/messenger/pref-receipts.js                                         (prefs/pref-receipts.js)
+    content/messenger/pref-character_encoding.xul                              (prefs/pref-character_encoding.xul)
+    content/messenger/pref-character_encoding.js                               (prefs/pref-character_encoding.js)
+    content/messenger/pref-offline.xul                                         (prefs/pref-offline.xul)
+    content/messenger/pref-offline.js                                          (prefs/pref-offline.js)
+    content/messenger/SearchDialog.xul                                         (search/SearchDialog.xul)
+    content/messenger/SearchDialog.js                                          (search/SearchDialog.js)
+    content/messenger/ABSearchDialog.xul                                       (search/ABSearchDialog.xul)
+    content/messenger/ABSearchDialog.js                                        (search/ABSearchDialog.js)
+    content/messenger/FilterListDialog.xul                                     (search/FilterListDialog.xul)
+    content/messenger/FilterListDialog.js                                      (search/FilterListDialog.js)
+    content/messenger/messengercompose/pref-composing_messages.xul             (compose/prefs/pref-composing_messages.xul)
+    content/messenger/messengercompose/pref-composing_messages.js              (compose/prefs/pref-composing_messages.js)
+    content/messenger/messengercompose/pref-formatting.xul                     (compose/prefs/pref-formatting.xul)
+    content/messenger/messengercompose/pref-formatting.js                      (compose/prefs/pref-formatting.js)
+    content/messenger/messengercompose/messengercompose.xul                    (compose/messengercompose.xul)
+    content/messenger/messengercompose/MsgComposeCommands.js                   (compose/MsgComposeCommands.js)
+    content/messenger/messengercompose/addressingWidgetOverlay.js              (compose/addressingWidgetOverlay.js)
+    content/messenger/messengercompose/addressingWidgetOverlay.xul             (compose/addressingWidgetOverlay.xul)
+    content/messenger/messengercompose/mailComposeExtrasOverlay.xul            (compose/mailComposeExtrasOverlay.xul)
+    content/messenger/addressbook/addressbook.js                               (addrbook/addressbook.js)
+    content/messenger/addressbook/addressbook.xul                              (addrbook/addressbook.xul)
+    content/messenger/addressbook/abCommon.js                                  (addrbook/abCommon.js)
+    content/messenger/addressbook/abCardOverlay.js                             (addrbook/abCardOverlay.js)
+    content/messenger/addressbook/abCardViewOverlay.js                         (addrbook/abCardViewOverlay.js)
+    content/messenger/addressbook/abMailListDialog.xul                         (addrbook/abMailListDialog.xul)
+    content/messenger/addressbook/abEditListDialog.xul                         (addrbook/abEditListDialog.xul)
+    content/messenger/addressbook/pref-addressing.js                           (addrbook/prefs/pref-addressing.js)
+    content/messenger/addressbook/pref-addressing.xul                          (addrbook/prefs/pref-addressing.xul)
+#ifdef XP_MACOSX
+    content/messenger/platformMailnewsOverlay.xul                              (mac/platformMailnewsOverlay.xul)
+#else
+#ifdef XP_WIN32
+    content/messenger/platformMailnewsOverlay.xul                              (win/platformMailnewsOverlay.xul)
+#else
+#ifdef XP_OS2
+    content/messenger/platformMailnewsOverlay.xul                              (win/platformMailnewsOverlay.xul)
+#else
+    content/messenger/platformMailnewsOverlay.xul                              (unix/platformMailnewsOverlay.xul)
+#endif
+#endif
rename from mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
rename to suite/mailnews/mac/platformMailnewsOverlay.xul
rename from mailnews/base/resources/content/mail-offline.js
rename to suite/mailnews/mail-offline.js
rename from mailnews/base/resources/content/mail3PaneWindowCommands.js
rename to suite/mailnews/mail3PaneWindowCommands.js
rename from mailnews/base/resources/content/mailABOverlay.xul
rename to suite/mailnews/mailABOverlay.xul
rename from mailnews/base/resources/content/mailCommands.js
rename to suite/mailnews/mailCommands.js
rename from mailnews/base/resources/content/mailContextMenus.js
rename to suite/mailnews/mailContextMenus.js
rename from mailnews/base/resources/content/mailEditorOverlay.xul
rename to suite/mailnews/mailEditorOverlay.xul
rename from mailnews/base/resources/content/mailMessengerComposeOverlay.xul
rename to suite/mailnews/mailMessengerComposeOverlay.xul
rename from mailnews/base/resources/content/mailMessengerOverlay.xul
rename to suite/mailnews/mailMessengerOverlay.xul
rename from mailnews/base/resources/content/mailOverlay.xul
rename to suite/mailnews/mailOverlay.xul
rename from mailnews/base/resources/content/mailTasksOverlay.js
rename to suite/mailnews/mailTasksOverlay.js
rename from mailnews/base/resources/content/mailTasksOverlay.xul
rename to suite/mailnews/mailTasksOverlay.xul
copy from mailnews/extensions/mailviews/resources/content/mailViewList.js
copy to suite/mailnews/mailViewList.js
copy from mailnews/extensions/mailviews/resources/content/mailViewList.xul
copy to suite/mailnews/mailViewList.xul
copy from mailnews/extensions/mailviews/resources/content/mailViewSetup.js
copy to suite/mailnews/mailViewSetup.js
copy from mailnews/extensions/mailviews/resources/content/mailViewSetup.xul
copy to suite/mailnews/mailViewSetup.xul
rename from mailnews/base/resources/content/mailWindow.js
rename to suite/mailnews/mailWindow.js
rename from mailnews/base/resources/content/mailWindowOverlay.js
rename to suite/mailnews/mailWindowOverlay.js
rename from mailnews/base/resources/content/mailWindowOverlay.xul
rename to suite/mailnews/mailWindowOverlay.xul
rename from mailnews/base/resources/content/messageWindow.js
rename to suite/mailnews/messageWindow.js
rename from mailnews/base/resources/content/messageWindow.xul
rename to suite/mailnews/messageWindow.xul
rename from mailnews/base/resources/content/messenger.css
rename to suite/mailnews/messenger.css
rename from mailnews/base/resources/content/messenger.xul
rename to suite/mailnews/messenger.xul
rename from mailnews/base/resources/content/msgFolderPickerOverlay.xul
rename to suite/mailnews/msgFolderPickerOverlay.xul
rename from mailnews/base/resources/content/msgHdrViewOverlay.js
rename to suite/mailnews/msgHdrViewOverlay.js
rename from mailnews/base/resources/content/msgHdrViewOverlay.xul
rename to suite/mailnews/msgHdrViewOverlay.xul
rename from mailnews/base/resources/content/msgMail3PaneWindow.js
rename to suite/mailnews/msgMail3PaneWindow.js
rename from mailnews/base/resources/content/msgPrintEngine.xul
rename to suite/mailnews/msgPrintEngine.xul
rename from mailnews/base/resources/content/msgSelectOffline.xul
rename to suite/mailnews/msgSelectOffline.xul
copy from mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.js
copy to suite/mailnews/msgViewPickerOverlay.js
rename from mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.xul
rename to suite/mailnews/msgViewPickerOverlay.xul
old mode 100755
new mode 100644
rename from mailnews/base/resources/content/phishingDetector.js
rename to suite/mailnews/phishingDetector.js
rename from mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
rename to suite/mailnews/prefs/mailPrefsOverlay.xul
rename from mailnews/base/prefs/resources/content/pref-character_encoding.js
rename to suite/mailnews/prefs/pref-character_encoding.js
rename from mailnews/base/prefs/resources/content/pref-character_encoding.xul
rename to suite/mailnews/prefs/pref-character_encoding.xul
rename from mailnews/base/prefs/resources/content/pref-junk.js
rename to suite/mailnews/prefs/pref-junk.js
rename from mailnews/base/prefs/resources/content/pref-junk.xul
rename to suite/mailnews/prefs/pref-junk.xul
rename from mailnews/base/prefs/resources/content/pref-mailnews.js
rename to suite/mailnews/prefs/pref-mailnews.js
rename from mailnews/base/prefs/resources/content/pref-mailnews.xul
rename to suite/mailnews/prefs/pref-mailnews.xul
rename from mailnews/base/prefs/resources/content/pref-notifications.js
rename to suite/mailnews/prefs/pref-notifications.js
rename from mailnews/base/prefs/resources/content/pref-notifications.xul
rename to suite/mailnews/prefs/pref-notifications.xul
rename from mailnews/base/prefs/resources/content/pref-offline.js
rename to suite/mailnews/prefs/pref-offline.js
rename from mailnews/base/prefs/resources/content/pref-offline.xul
rename to suite/mailnews/prefs/pref-offline.xul
rename from mailnews/base/prefs/resources/content/pref-receipts.js
rename to suite/mailnews/prefs/pref-receipts.js
rename from mailnews/base/prefs/resources/content/pref-receipts.xul
rename to suite/mailnews/prefs/pref-receipts.xul
rename from mailnews/base/prefs/resources/content/pref-tags.js
rename to suite/mailnews/prefs/pref-tags.js
rename from mailnews/base/prefs/resources/content/pref-tags.xul
rename to suite/mailnews/prefs/pref-tags.xul
rename from mailnews/base/prefs/resources/content/pref-viewing_messages.js
rename to suite/mailnews/prefs/pref-viewing_messages.js
rename from mailnews/base/prefs/resources/content/pref-viewing_messages.xul
rename to suite/mailnews/prefs/pref-viewing_messages.xul
rename from mailnews/base/search/resources/content/ABSearchDialog.js
rename to suite/mailnews/search/ABSearchDialog.js
rename from mailnews/base/search/resources/content/ABSearchDialog.xul
rename to suite/mailnews/search/ABSearchDialog.xul
rename from mailnews/base/search/resources/content/FilterListDialog.js
rename to suite/mailnews/search/FilterListDialog.js
rename from mailnews/base/search/resources/content/FilterListDialog.xul
rename to suite/mailnews/search/FilterListDialog.xul
copy from mailnews/base/search/resources/content/SearchDialog.js
copy to suite/mailnews/search/SearchDialog.js
rename from mailnews/base/search/resources/content/SearchDialog.xul
rename to suite/mailnews/search/SearchDialog.xul
rename from mailnews/base/resources/content/searchBar.js
rename to suite/mailnews/searchBar.js
rename from mailnews/base/resources/content/subscribe.js
rename to suite/mailnews/subscribe.js
rename from mailnews/base/resources/content/subscribe.xul
rename to suite/mailnews/subscribe.xul
copy from mailnews/base/resources/content/threadPane.js
copy to suite/mailnews/threadPane.js
rename from mailnews/base/resources/content/threadPane.xul
rename to suite/mailnews/threadPane.xul
rename from mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
rename to suite/mailnews/unix/platformMailnewsOverlay.xul
rename from mailnews/base/resources/content/widgetglue.js
rename to suite/mailnews/widgetglue.js
rename from mailnews/base/resources/content/win/platformMailnewsOverlay.xul
rename to suite/mailnews/win/platformMailnewsOverlay.xul