Bug 1506440 - Align SeaMonkey mailnews source structure with Thunderbird. r=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Mon, 14 Jan 2019 23:49:44 +0100
changeset 33342 5efd0e02c927
parent 33341 f9cedb1d7834
child 33343 54b1c3f11dee
push id2368
push userclokep@gmail.com
push dateMon, 28 Jan 2019 21:12:50 +0000
treeherdercomm-beta@56d23c07d815 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs1506440
Bug 1506440 - Align SeaMonkey mailnews source structure with Thunderbird. r=IanN
suite/mailnews/addrbook/abCardOverlay.js
suite/mailnews/addrbook/abCardOverlay.xul
suite/mailnews/addrbook/abCardViewOverlay.js
suite/mailnews/addrbook/abCommon.js
suite/mailnews/addrbook/abEditListDialog.xul
suite/mailnews/addrbook/abListOverlay.xul
suite/mailnews/addrbook/abMailListDialog.xul
suite/mailnews/addrbook/abSelectAddressesDialog.js
suite/mailnews/addrbook/abSelectAddressesDialog.xul
suite/mailnews/addrbook/abTrees.js
suite/mailnews/addrbook/addressbook-panel.js
suite/mailnews/addrbook/addressbook-panel.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/browserRequest.js
suite/mailnews/browserRequest.xul
suite/mailnews/commandglue.js
suite/mailnews/components/addrbook/content/abCardOverlay.js
suite/mailnews/components/addrbook/content/abCardOverlay.xul
suite/mailnews/components/addrbook/content/abCardViewOverlay.js
suite/mailnews/components/addrbook/content/abCommon.js
suite/mailnews/components/addrbook/content/abEditListDialog.xul
suite/mailnews/components/addrbook/content/abListOverlay.xul
suite/mailnews/components/addrbook/content/abMailListDialog.xul
suite/mailnews/components/addrbook/content/abSelectAddressesDialog.js
suite/mailnews/components/addrbook/content/abSelectAddressesDialog.xul
suite/mailnews/components/addrbook/content/abTrees.js
suite/mailnews/components/addrbook/content/addressbook-panel.js
suite/mailnews/components/addrbook/content/addressbook-panel.xul
suite/mailnews/components/addrbook/content/addressbook.js
suite/mailnews/components/addrbook/content/addressbook.xul
suite/mailnews/components/addrbook/content/prefs/pref-addressing.js
suite/mailnews/components/addrbook/content/prefs/pref-addressing.xul
suite/mailnews/components/addrbook/jar.mn
suite/mailnews/components/addrbook/moz.build
suite/mailnews/components/compose/content/MsgComposeCommands.js
suite/mailnews/components/compose/content/addressingWidgetOverlay.js
suite/mailnews/components/compose/content/addressingWidgetOverlay.xul
suite/mailnews/components/compose/content/mailComposeExtrasOverlay.xul
suite/mailnews/components/compose/content/mailComposeOverlay.xul
suite/mailnews/components/compose/content/messengercompose.xul
suite/mailnews/components/compose/content/msgComposeContextOverlay.xul
suite/mailnews/components/compose/content/prefs/pref-composing_messages.js
suite/mailnews/components/compose/content/prefs/pref-composing_messages.xul
suite/mailnews/components/compose/content/prefs/pref-formatting.js
suite/mailnews/components/compose/content/prefs/pref-formatting.xul
suite/mailnews/components/compose/jar.mn
suite/mailnews/components/compose/moz.build
suite/mailnews/components/moz.build
suite/mailnews/components/prefs/content/mailPrefsOverlay.xul
suite/mailnews/components/prefs/content/pref-character_encoding.js
suite/mailnews/components/prefs/content/pref-character_encoding.xul
suite/mailnews/components/prefs/content/pref-junk.js
suite/mailnews/components/prefs/content/pref-junk.xul
suite/mailnews/components/prefs/content/pref-mailnews.js
suite/mailnews/components/prefs/content/pref-mailnews.xul
suite/mailnews/components/prefs/content/pref-notifications.js
suite/mailnews/components/prefs/content/pref-notifications.xul
suite/mailnews/components/prefs/content/pref-offline.js
suite/mailnews/components/prefs/content/pref-offline.xul
suite/mailnews/components/prefs/content/pref-receipts.js
suite/mailnews/components/prefs/content/pref-receipts.xul
suite/mailnews/components/prefs/content/pref-tags.js
suite/mailnews/components/prefs/content/pref-tags.xul
suite/mailnews/components/prefs/content/pref-viewing_messages.js
suite/mailnews/components/prefs/content/pref-viewing_messages.xul
suite/mailnews/components/prefs/jar.mn
suite/mailnews/components/prefs/moz.build
suite/mailnews/compose/MsgComposeCommands.js
suite/mailnews/compose/addressingWidgetOverlay.js
suite/mailnews/compose/addressingWidgetOverlay.xul
suite/mailnews/compose/mailComposeExtrasOverlay.xul
suite/mailnews/compose/mailComposeOverlay.xul
suite/mailnews/compose/messengercompose.xul
suite/mailnews/compose/msgComposeContextOverlay.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/content/ABSearchDialog.js
suite/mailnews/content/ABSearchDialog.xul
suite/mailnews/content/FilterListDialog.js
suite/mailnews/content/FilterListDialog.xul
suite/mailnews/content/SearchDialog.js
suite/mailnews/content/SearchDialog.xul
suite/mailnews/content/browserRequest.js
suite/mailnews/content/browserRequest.xul
suite/mailnews/content/commandglue.js
suite/mailnews/content/folderDisplay.js
suite/mailnews/content/folderPane.xul
suite/mailnews/content/mac/platformMailnewsOverlay.xul
suite/mailnews/content/mail-offline.js
suite/mailnews/content/mail3PaneWindowCommands.js
suite/mailnews/content/mailCommands.js
suite/mailnews/content/mailContextMenus.js
suite/mailnews/content/mailEditorOverlay.xul
suite/mailnews/content/mailKeysOverlay.xul
suite/mailnews/content/mailOverlay.js
suite/mailnews/content/mailOverlay.xul
suite/mailnews/content/mailTasksOverlay.js
suite/mailnews/content/mailTasksOverlay.xul
suite/mailnews/content/mailViewList.js
suite/mailnews/content/mailViewList.xul
suite/mailnews/content/mailViewSetup.js
suite/mailnews/content/mailViewSetup.xul
suite/mailnews/content/mailWidgets.xml
suite/mailnews/content/mailWindow.js
suite/mailnews/content/mailWindowOverlay.js
suite/mailnews/content/mailWindowOverlay.xul
suite/mailnews/content/messageWindow.js
suite/mailnews/content/messageWindow.xul
suite/mailnews/content/messenger.css
suite/mailnews/content/messenger.xul
suite/mailnews/content/messengerdnd.js
suite/mailnews/content/msgFolderPickerOverlay.xul
suite/mailnews/content/msgHdrViewOverlay.js
suite/mailnews/content/msgHdrViewOverlay.xul
suite/mailnews/content/msgMail3PaneWindow.js
suite/mailnews/content/msgViewNavigation.js
suite/mailnews/content/msgViewPickerOverlay.js
suite/mailnews/content/nsDragAndDrop.js
suite/mailnews/content/phishingDetector.js
suite/mailnews/content/searchBar.js
suite/mailnews/content/start.xhtml
suite/mailnews/content/tabmail.js
suite/mailnews/content/tabmail.xml
suite/mailnews/content/threadPane.js
suite/mailnews/content/threadPane.xul
suite/mailnews/content/unix/platformMailnewsOverlay.xul
suite/mailnews/content/widgetglue.js
suite/mailnews/content/win/platformMailnewsOverlay.xul
suite/mailnews/folderDisplay.js
suite/mailnews/folderPane.xul
suite/mailnews/jar.mn
suite/mailnews/mac/platformMailnewsOverlay.xul
suite/mailnews/mail-offline.js
suite/mailnews/mail3PaneWindowCommands.js
suite/mailnews/mailCommands.js
suite/mailnews/mailContextMenus.js
suite/mailnews/mailEditorOverlay.xul
suite/mailnews/mailKeysOverlay.xul
suite/mailnews/mailOverlay.js
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/mailWidgets.xml
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/messengerdnd.js
suite/mailnews/modules/moz.build
suite/mailnews/moz.build
suite/mailnews/msgFolderPickerOverlay.xul
suite/mailnews/msgHdrViewOverlay.js
suite/mailnews/msgHdrViewOverlay.xul
suite/mailnews/msgMail3PaneWindow.js
suite/mailnews/msgViewNavigation.js
suite/mailnews/msgViewPickerOverlay.js
suite/mailnews/nsDragAndDrop.js
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/start.xhtml
suite/mailnews/tabmail.js
suite/mailnews/tabmail.xml
suite/mailnews/threadPane.js
suite/mailnews/threadPane.xul
suite/mailnews/unix/platformMailnewsOverlay.xul
suite/mailnews/widgetglue.js
suite/mailnews/win/platformMailnewsOverlay.xul
rename from suite/mailnews/addrbook/abCardOverlay.js
rename to suite/mailnews/components/addrbook/content/abCardOverlay.js
rename from suite/mailnews/addrbook/abCardOverlay.xul
rename to suite/mailnews/components/addrbook/content/abCardOverlay.xul
rename from suite/mailnews/addrbook/abCardViewOverlay.js
rename to suite/mailnews/components/addrbook/content/abCardViewOverlay.js
rename from suite/mailnews/addrbook/abCommon.js
rename to suite/mailnews/components/addrbook/content/abCommon.js
rename from suite/mailnews/addrbook/abEditListDialog.xul
rename to suite/mailnews/components/addrbook/content/abEditListDialog.xul
rename from suite/mailnews/addrbook/abListOverlay.xul
rename to suite/mailnews/components/addrbook/content/abListOverlay.xul
rename from suite/mailnews/addrbook/abMailListDialog.xul
rename to suite/mailnews/components/addrbook/content/abMailListDialog.xul
rename from suite/mailnews/addrbook/abSelectAddressesDialog.js
rename to suite/mailnews/components/addrbook/content/abSelectAddressesDialog.js
rename from suite/mailnews/addrbook/abSelectAddressesDialog.xul
rename to suite/mailnews/components/addrbook/content/abSelectAddressesDialog.xul
rename from suite/mailnews/addrbook/abTrees.js
rename to suite/mailnews/components/addrbook/content/abTrees.js
rename from suite/mailnews/addrbook/addressbook-panel.js
rename to suite/mailnews/components/addrbook/content/addressbook-panel.js
rename from suite/mailnews/addrbook/addressbook-panel.xul
rename to suite/mailnews/components/addrbook/content/addressbook-panel.xul
rename from suite/mailnews/addrbook/addressbook.js
rename to suite/mailnews/components/addrbook/content/addressbook.js
rename from suite/mailnews/addrbook/addressbook.xul
rename to suite/mailnews/components/addrbook/content/addressbook.xul
rename from suite/mailnews/addrbook/prefs/pref-addressing.js
rename to suite/mailnews/components/addrbook/content/prefs/pref-addressing.js
rename from suite/mailnews/addrbook/prefs/pref-addressing.xul
rename to suite/mailnews/components/addrbook/content/prefs/pref-addressing.xul
new file mode 100644
--- /dev/null
+++ b/suite/mailnews/components/addrbook/jar.mn
@@ -0,0 +1,21 @@
+# 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:
+    content/messenger/addressbook/addressbook.js                               (content/addressbook.js)
+    content/messenger/addressbook/addressbook.xul                              (content/addressbook.xul)
+    content/messenger/addressbook/abCommon.js                                  (content/abCommon.js)
+    content/messenger/addressbook/abCardOverlay.js                             (content/abCardOverlay.js)
+    content/messenger/addressbook/abCardOverlay.xul                            (content/abCardOverlay.xul)
+    content/messenger/addressbook/abCardViewOverlay.js                         (content/abCardViewOverlay.js)
+    content/messenger/addressbook/abMailListDialog.xul                         (content/abMailListDialog.xul)
+    content/messenger/addressbook/abEditListDialog.xul                         (content/abEditListDialog.xul)
+    content/messenger/addressbook/abListOverlay.xul                            (content/abListOverlay.xul)
+    content/messenger/addressbook/abSelectAddressesDialog.js                   (content/abSelectAddressesDialog.js)
+    content/messenger/addressbook/abSelectAddressesDialog.xul                  (content/abSelectAddressesDialog.xul)
+    content/messenger/addressbook/abTrees.js                                   (content/abTrees.js)
+    content/messenger/addressbook/addressbook-panel.xul                        (content/addressbook-panel.xul)
+    content/messenger/addressbook/addressbook-panel.js                         (content/addressbook-panel.js)
+    content/messenger/addressbook/pref-addressing.js                           (content/prefs/pref-addressing.js)
+    content/messenger/addressbook/pref-addressing.xul                          (content/prefs/pref-addressing.xul)
new file mode 100644
--- /dev/null
+++ b/suite/mailnews/components/addrbook/moz.build
@@ -0,0 +1,8 @@
+# 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']
+
+DEFINES['TOOLKIT_DIR'] = "%s/toolkit" % (CONFIG['moztopsrcdir'],)
rename from suite/mailnews/compose/MsgComposeCommands.js
rename to suite/mailnews/components/compose/content/MsgComposeCommands.js
rename from suite/mailnews/compose/addressingWidgetOverlay.js
rename to suite/mailnews/components/compose/content/addressingWidgetOverlay.js
rename from suite/mailnews/compose/addressingWidgetOverlay.xul
rename to suite/mailnews/components/compose/content/addressingWidgetOverlay.xul
rename from suite/mailnews/compose/mailComposeExtrasOverlay.xul
rename to suite/mailnews/components/compose/content/mailComposeExtrasOverlay.xul
rename from suite/mailnews/compose/mailComposeOverlay.xul
rename to suite/mailnews/components/compose/content/mailComposeOverlay.xul
rename from suite/mailnews/compose/messengercompose.xul
rename to suite/mailnews/components/compose/content/messengercompose.xul
rename from suite/mailnews/compose/msgComposeContextOverlay.xul
rename to suite/mailnews/components/compose/content/msgComposeContextOverlay.xul
rename from suite/mailnews/compose/prefs/pref-composing_messages.js
rename to suite/mailnews/components/compose/content/prefs/pref-composing_messages.js
rename from suite/mailnews/compose/prefs/pref-composing_messages.xul
rename to suite/mailnews/components/compose/content/prefs/pref-composing_messages.xul
rename from suite/mailnews/compose/prefs/pref-formatting.js
rename to suite/mailnews/components/compose/content/prefs/pref-formatting.js
rename from suite/mailnews/compose/prefs/pref-formatting.xul
rename to suite/mailnews/components/compose/content/prefs/pref-formatting.xul
new file mode 100644
--- /dev/null
+++ b/suite/mailnews/components/compose/jar.mn
@@ -0,0 +1,16 @@
+# 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:
+    content/messenger/messengercompose/pref-composing_messages.xul             (content/prefs/pref-composing_messages.xul)
+    content/messenger/messengercompose/pref-composing_messages.js              (content/prefs/pref-composing_messages.js)
+    content/messenger/messengercompose/pref-formatting.xul                     (content/prefs/pref-formatting.xul)
+    content/messenger/messengercompose/pref-formatting.js                      (content/prefs/pref-formatting.js)
+    content/messenger/messengercompose/messengercompose.xul                    (content/messengercompose.xul)
+    content/messenger/messengercompose/mailComposeOverlay.xul                  (content/mailComposeOverlay.xul)
+    content/messenger/messengercompose/msgComposeContextOverlay.xul            (content/msgComposeContextOverlay.xul)
+    content/messenger/messengercompose/MsgComposeCommands.js                   (content/MsgComposeCommands.js)
+    content/messenger/messengercompose/addressingWidgetOverlay.js              (content/addressingWidgetOverlay.js)
+    content/messenger/messengercompose/addressingWidgetOverlay.xul             (content/addressingWidgetOverlay.xul)
+    content/messenger/messengercompose/mailComposeExtrasOverlay.xul            (content/mailComposeExtrasOverlay.xul)
new file mode 100644
--- /dev/null
+++ b/suite/mailnews/components/compose/moz.build
@@ -0,0 +1,6 @@
+# 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']
new file mode 100644
--- /dev/null
+++ b/suite/mailnews/components/moz.build
@@ -0,0 +1,10 @@
+# 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/.
+
+DIRS += [
+    'compose',
+    'prefs',
+    'addrbook',
+]
rename from suite/mailnews/prefs/mailPrefsOverlay.xul
rename to suite/mailnews/components/prefs/content/mailPrefsOverlay.xul
rename from suite/mailnews/prefs/pref-character_encoding.js
rename to suite/mailnews/components/prefs/content/pref-character_encoding.js
rename from suite/mailnews/prefs/pref-character_encoding.xul
rename to suite/mailnews/components/prefs/content/pref-character_encoding.xul
rename from suite/mailnews/prefs/pref-junk.js
rename to suite/mailnews/components/prefs/content/pref-junk.js
rename from suite/mailnews/prefs/pref-junk.xul
rename to suite/mailnews/components/prefs/content/pref-junk.xul
rename from suite/mailnews/prefs/pref-mailnews.js
rename to suite/mailnews/components/prefs/content/pref-mailnews.js
rename from suite/mailnews/prefs/pref-mailnews.xul
rename to suite/mailnews/components/prefs/content/pref-mailnews.xul
rename from suite/mailnews/prefs/pref-notifications.js
rename to suite/mailnews/components/prefs/content/pref-notifications.js
rename from suite/mailnews/prefs/pref-notifications.xul
rename to suite/mailnews/components/prefs/content/pref-notifications.xul
rename from suite/mailnews/prefs/pref-offline.js
rename to suite/mailnews/components/prefs/content/pref-offline.js
rename from suite/mailnews/prefs/pref-offline.xul
rename to suite/mailnews/components/prefs/content/pref-offline.xul
rename from suite/mailnews/prefs/pref-receipts.js
rename to suite/mailnews/components/prefs/content/pref-receipts.js
rename from suite/mailnews/prefs/pref-receipts.xul
rename to suite/mailnews/components/prefs/content/pref-receipts.xul
rename from suite/mailnews/prefs/pref-tags.js
rename to suite/mailnews/components/prefs/content/pref-tags.js
rename from suite/mailnews/prefs/pref-tags.xul
rename to suite/mailnews/components/prefs/content/pref-tags.xul
rename from suite/mailnews/prefs/pref-viewing_messages.js
rename to suite/mailnews/components/prefs/content/pref-viewing_messages.js
rename from suite/mailnews/prefs/pref-viewing_messages.xul
rename to suite/mailnews/components/prefs/content/pref-viewing_messages.xul
new file mode 100644
--- /dev/null
+++ b/suite/mailnews/components/prefs/jar.mn
@@ -0,0 +1,23 @@
+# 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:
+    content/messenger/mailPrefsOverlay.xul                                     (content/mailPrefsOverlay.xul)
+    content/messenger/pref-mailnews.xul                                        (content/pref-mailnews.xul)
+    content/messenger/pref-mailnews.js                                         (content/pref-mailnews.js)
+    content/messenger/pref-notifications.xul                                   (content/pref-notifications.xul)
+    content/messenger/pref-notifications.js                                    (content/pref-notifications.js)
+    content/messenger/pref-junk.xul                                            (content/pref-junk.xul)
+    content/messenger/pref-junk.js                                             (content/pref-junk.js)
+    content/messenger/pref-tags.xul                                            (content/pref-tags.xul)
+    content/messenger/pref-tags.js                                             (content/pref-tags.js)
+    content/messenger/pref-viewing_messages.xul                                (content/pref-viewing_messages.xul)
+    content/messenger/pref-viewing_messages.js                                 (content/pref-viewing_messages.js)
+    content/messenger/pref-receipts.xul                                        (content/pref-receipts.xul)
+    content/messenger/pref-receipts.js                                         (content/pref-receipts.js)
+    content/messenger/pref-character_encoding.xul                              (content/pref-character_encoding.xul)
+    content/messenger/pref-character_encoding.js                               (content/pref-character_encoding.js)
+    content/messenger/pref-offline.xul                                         (content/pref-offline.xul)
+    content/messenger/pref-offline.js                                          (content/pref-offline.js)
+
new file mode 100644
--- /dev/null
+++ b/suite/mailnews/components/prefs/moz.build
@@ -0,0 +1,6 @@
+# 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']
rename from suite/mailnews/search/ABSearchDialog.js
rename to suite/mailnews/content/ABSearchDialog.js
rename from suite/mailnews/search/ABSearchDialog.xul
rename to suite/mailnews/content/ABSearchDialog.xul
rename from suite/mailnews/search/FilterListDialog.js
rename to suite/mailnews/content/FilterListDialog.js
rename from suite/mailnews/search/FilterListDialog.xul
rename to suite/mailnews/content/FilterListDialog.xul
rename from suite/mailnews/search/SearchDialog.js
rename to suite/mailnews/content/SearchDialog.js
rename from suite/mailnews/search/SearchDialog.xul
rename to suite/mailnews/content/SearchDialog.xul
rename from suite/mailnews/browserRequest.js
rename to suite/mailnews/content/browserRequest.js
rename from suite/mailnews/browserRequest.xul
rename to suite/mailnews/content/browserRequest.xul
rename from suite/mailnews/commandglue.js
rename to suite/mailnews/content/commandglue.js
rename from suite/mailnews/folderDisplay.js
rename to suite/mailnews/content/folderDisplay.js
rename from suite/mailnews/folderPane.xul
rename to suite/mailnews/content/folderPane.xul
rename from suite/mailnews/mac/platformMailnewsOverlay.xul
rename to suite/mailnews/content/mac/platformMailnewsOverlay.xul
rename from suite/mailnews/mail-offline.js
rename to suite/mailnews/content/mail-offline.js
rename from suite/mailnews/mail3PaneWindowCommands.js
rename to suite/mailnews/content/mail3PaneWindowCommands.js
rename from suite/mailnews/mailCommands.js
rename to suite/mailnews/content/mailCommands.js
rename from suite/mailnews/mailContextMenus.js
rename to suite/mailnews/content/mailContextMenus.js
rename from suite/mailnews/mailEditorOverlay.xul
rename to suite/mailnews/content/mailEditorOverlay.xul
rename from suite/mailnews/mailKeysOverlay.xul
rename to suite/mailnews/content/mailKeysOverlay.xul
rename from suite/mailnews/mailOverlay.js
rename to suite/mailnews/content/mailOverlay.js
rename from suite/mailnews/mailOverlay.xul
rename to suite/mailnews/content/mailOverlay.xul
rename from suite/mailnews/mailTasksOverlay.js
rename to suite/mailnews/content/mailTasksOverlay.js
rename from suite/mailnews/mailTasksOverlay.xul
rename to suite/mailnews/content/mailTasksOverlay.xul
rename from suite/mailnews/mailViewList.js
rename to suite/mailnews/content/mailViewList.js
rename from suite/mailnews/mailViewList.xul
rename to suite/mailnews/content/mailViewList.xul
rename from suite/mailnews/mailViewSetup.js
rename to suite/mailnews/content/mailViewSetup.js
rename from suite/mailnews/mailViewSetup.xul
rename to suite/mailnews/content/mailViewSetup.xul
rename from suite/mailnews/mailWidgets.xml
rename to suite/mailnews/content/mailWidgets.xml
rename from suite/mailnews/mailWindow.js
rename to suite/mailnews/content/mailWindow.js
rename from suite/mailnews/mailWindowOverlay.js
rename to suite/mailnews/content/mailWindowOverlay.js
rename from suite/mailnews/mailWindowOverlay.xul
rename to suite/mailnews/content/mailWindowOverlay.xul
rename from suite/mailnews/messageWindow.js
rename to suite/mailnews/content/messageWindow.js
rename from suite/mailnews/messageWindow.xul
rename to suite/mailnews/content/messageWindow.xul
rename from suite/mailnews/messenger.css
rename to suite/mailnews/content/messenger.css
rename from suite/mailnews/messenger.xul
rename to suite/mailnews/content/messenger.xul
rename from suite/mailnews/messengerdnd.js
rename to suite/mailnews/content/messengerdnd.js
rename from suite/mailnews/msgFolderPickerOverlay.xul
rename to suite/mailnews/content/msgFolderPickerOverlay.xul
rename from suite/mailnews/msgHdrViewOverlay.js
rename to suite/mailnews/content/msgHdrViewOverlay.js
rename from suite/mailnews/msgHdrViewOverlay.xul
rename to suite/mailnews/content/msgHdrViewOverlay.xul
rename from suite/mailnews/msgMail3PaneWindow.js
rename to suite/mailnews/content/msgMail3PaneWindow.js
rename from suite/mailnews/msgViewNavigation.js
rename to suite/mailnews/content/msgViewNavigation.js
rename from suite/mailnews/msgViewPickerOverlay.js
rename to suite/mailnews/content/msgViewPickerOverlay.js
rename from suite/mailnews/nsDragAndDrop.js
rename to suite/mailnews/content/nsDragAndDrop.js
rename from suite/mailnews/phishingDetector.js
rename to suite/mailnews/content/phishingDetector.js
rename from suite/mailnews/searchBar.js
rename to suite/mailnews/content/searchBar.js
rename from suite/mailnews/start.xhtml
rename to suite/mailnews/content/start.xhtml
rename from suite/mailnews/tabmail.js
rename to suite/mailnews/content/tabmail.js
rename from suite/mailnews/tabmail.xml
rename to suite/mailnews/content/tabmail.xml
rename from suite/mailnews/threadPane.js
rename to suite/mailnews/content/threadPane.js
rename from suite/mailnews/threadPane.xul
rename to suite/mailnews/content/threadPane.xul
rename from suite/mailnews/unix/platformMailnewsOverlay.xul
rename to suite/mailnews/content/unix/platformMailnewsOverlay.xul
rename from suite/mailnews/widgetglue.js
rename to suite/mailnews/content/widgetglue.js
rename from suite/mailnews/win/platformMailnewsOverlay.xul
rename to suite/mailnews/content/win/platformMailnewsOverlay.xul
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -13,110 +13,68 @@ messenger.jar:
 % 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://messenger/content/addressbook/abSelectAddressesDialog.xul   chrome://messenger/content/mailOverlay.xul
 % overlay chrome://editor/content/composerOverlay.xul                          chrome://messenger/content/mailEditorOverlay.xul
-    content/messenger/browserRequest.xul
-    content/messenger/browserRequest.js
-    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/nsDragAndDrop.js
-    content/messenger/tabmail.xml
-    content/messenger/tabmail.js
-    content/messenger/messenger.css
-    content/messenger/messenger.xul
-    content/messenger/mailWindowOverlay.xul
-    content/messenger/mailWindowOverlay.js
-    content/messenger/mailWindow.js
-    content/messenger/messageWindow.xul
-    content/messenger/messageWindow.js
-    content/messenger/folderPane.xul
-    content/messenger/folderDisplay.js
-    content/messenger/threadPane.xul
-    content/messenger/threadPane.js
-    content/messenger/msgHdrViewOverlay.xul
-    content/messenger/msgHdrViewOverlay.js
-    content/messenger/msgViewNavigation.js
-    content/messenger/widgetglue.js
-    content/messenger/commandglue.js
-    content/messenger/mailCommands.js
-    content/messenger/msgMail3PaneWindow.js
-    content/messenger/searchBar.js
-    content/messenger/mail3PaneWindowCommands.js
-    content/messenger/mailTasksOverlay.xul
-    content/messenger/mailTasksOverlay.js
-    content/messenger/mailEditorOverlay.xul
-    content/messenger/mailKeysOverlay.xul
-    content/messenger/phishingDetector.js
-    content/messenger/mailOverlay.xul
-    content/messenger/mailOverlay.js
-    content/messenger/mail-offline.js
-    content/messenger/mailContextMenus.js
-    content/messenger/msgFolderPickerOverlay.xul
-    content/messenger/start.xhtml
-    content/messenger/messengerdnd.js
-    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/mailComposeOverlay.xul                  (compose/mailComposeOverlay.xul)
-    content/messenger/messengercompose/msgComposeContextOverlay.xul            (compose/msgComposeContextOverlay.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/abCardOverlay.xul                            (addrbook/abCardOverlay.xul)
-    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/abListOverlay.xul                            (addrbook/abListOverlay.xul)
-    content/messenger/addressbook/abSelectAddressesDialog.js                   (addrbook/abSelectAddressesDialog.js)
-    content/messenger/addressbook/abSelectAddressesDialog.xul                  (addrbook/abSelectAddressesDialog.xul)
-    content/messenger/addressbook/abTrees.js                                   (addrbook/abTrees.js)
-    content/messenger/addressbook/addressbook-panel.xul                        (addrbook/addressbook-panel.xul)
-    content/messenger/addressbook/addressbook-panel.js                         (addrbook/addressbook-panel.js)
-    content/messenger/addressbook/pref-addressing.js                           (addrbook/prefs/pref-addressing.js)
-    content/messenger/addressbook/pref-addressing.xul                          (addrbook/prefs/pref-addressing.xul)
+    content/messenger/browserRequest.js                                        (content/browserRequest.js)
+    content/messenger/browserRequest.xul                                       (content/browserRequest.xul)
+    content/messenger/commandglue.js                                           (content/commandglue.js)
+    content/messenger/folderPane.xul                                           (content/folderPane.xul)
+    content/messenger/folderDisplay.js                                         (content/folderDisplay.js)
+    content/messenger/mail-offline.js                                          (content/mail-offline.js)
+    content/messenger/mail3PaneWindowCommands.js                               (content/mail3PaneWindowCommands.js)
+    content/messenger/mailCommands.js                                          (content/mailCommands.js)
+    content/messenger/mailContextMenus.js                                      (content/mailContextMenus.js)
+    content/messenger/mailEditorOverlay.xul                                    (content/mailEditorOverlay.xul)
+    content/messenger/mailKeysOverlay.xul                                      (content/mailKeysOverlay.xul)
+    content/messenger/mailOverlay.js                                           (content/mailOverlay.js)
+    content/messenger/mailOverlay.xul                                          (content/mailOverlay.xul)
+    content/messenger/mailTasksOverlay.js                                      (content/mailTasksOverlay.js)
+    content/messenger/mailTasksOverlay.xul                                     (content/mailTasksOverlay.xul)
+    content/messenger/mailViewList.js                                          (content/mailViewList.js)
+    content/messenger/mailViewList.xul                                         (content/mailViewList.xul)
+    content/messenger/mailViewSetup.js                                         (content/mailViewSetup.js)
+    content/messenger/mailViewSetup.xul                                        (content/mailViewSetup.xul)
+    content/messenger/mailWidgets.xml                                          (content/mailWidgets.xml)
+    content/messenger/mailWindow.js                                            (content/mailWindow.js)
+    content/messenger/mailWindowOverlay.js                                     (content/mailWindowOverlay.js)
+    content/messenger/mailWindowOverlay.xul                                    (content/mailWindowOverlay.xul)
+    content/messenger/messageWindow.js                                         (content/messageWindow.js)
+    content/messenger/messageWindow.xul                                        (content/messageWindow.xul)
+    content/messenger/messenger.css                                            (content/messenger.css)
+    content/messenger/messenger.xul                                            (content/messenger.xul)
+    content/messenger/messengerdnd.js                                          (content/messengerdnd.js)
+    content/messenger/msgFolderPickerOverlay.xul                               (content/msgFolderPickerOverlay.xul)
+    content/messenger/msgHdrViewOverlay.js                                     (content/msgHdrViewOverlay.js)
+    content/messenger/msgHdrViewOverlay.xul                                    (content/msgHdrViewOverlay.xul)
+    content/messenger/msgMail3PaneWindow.js                                    (content/msgMail3PaneWindow.js)
+    content/messenger/msgViewNavigation.js                                     (content/msgViewNavigation.js)
+    content/messenger/msgViewPickerOverlay.js                                  (content/msgViewPickerOverlay.js)
+    content/messenger/nsDragAndDrop.js                                         (content/nsDragAndDrop.js)
+    content/messenger/phishingDetector.js                                      (content/phishingDetector.js)
+    content/messenger/searchBar.js                                             (content/searchBar.js)
+    content/messenger/start.xhtml                                              (content/start.xhtml)
+    content/messenger/tabmail.js                                               (content/tabmail.js)
+    content/messenger/tabmail.xml                                              (content/tabmail.xml)
+    content/messenger/threadPane.js                                            (content/threadPane.js)
+    content/messenger/threadPane.xul                                           (content/threadPane.xul)
+    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)
+
 #ifdef XP_MACOSX
-    content/messenger/platformMailnewsOverlay.xul                              (mac/platformMailnewsOverlay.xul)
+    content/messenger/platformMailnewsOverlay.xul                              (content/mac/platformMailnewsOverlay.xul)
 #else
 #ifdef XP_WIN32
-    content/messenger/platformMailnewsOverlay.xul                              (win/platformMailnewsOverlay.xul)
+    content/messenger/platformMailnewsOverlay.xul                              (content/win/platformMailnewsOverlay.xul)
 #else
-    content/messenger/platformMailnewsOverlay.xul                              (unix/platformMailnewsOverlay.xul)
+    content/messenger/platformMailnewsOverlay.xul                              (content/unix/platformMailnewsOverlay.xul)
 #endif
 #endif
--- a/suite/mailnews/modules/moz.build
+++ b/suite/mailnews/modules/moz.build
@@ -1,9 +1,8 @@
 # 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/.
 
 EXTRA_JS_MODULES += [
     'MailUtils.js',
 ]
-
--- a/suite/mailnews/moz.build
+++ b/suite/mailnews/moz.build
@@ -1,8 +1,11 @@
 # 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/.
 
-DIRS += ['modules']
+JAR_MANIFESTS += ['jar.mn']
 
-JAR_MANIFESTS += ['jar.mn']
+DIRS += [
+    'components',
+    'modules',
+]