Bug 469655 Drop intermediate Makefiles in mail/themes. r=philor
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 16 Dec 2008 09:48:29 +0000
changeset 1428 403e3d628d5b8e043e2c63f14198806bf5c9d62c
parent 1427 79fb05dfc64b7b513fff6fc559c422e2c663774f
child 1429 3c0ebc33dcfb50326663864202a50953ec92d5a1
push idunknown
push userunknown
push dateunknown
reviewersphilor
bugs469655
Bug 469655 Drop intermediate Makefiles in mail/themes. r=philor
mail/Makefile.in
mail/makefiles.sh
mail/themes/Makefile.in
mail/themes/pinstripe/Makefile.in
mail/themes/pinstripe/editor/Makefile.in
mail/themes/pinstripe/editor/jar.mn
mail/themes/pinstripe/jar.mn
mail/themes/pinstripe/mail/Makefile.in
mail/themes/pinstripe/mail/jar.mn
mail/themes/qute/Makefile.in
mail/themes/qute/editor/Makefile.in
mail/themes/qute/editor/jar.mn
mail/themes/qute/jar.mn
mail/themes/qute/mail/Makefile.in
mail/themes/qute/mail/jar.mn
--- a/mail/Makefile.in
+++ b/mail/Makefile.in
@@ -37,17 +37,30 @@
 
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-DIRS		= base locales components extensions themes app 
+DIRS		= base locales components extensions app 
+
+#
+# Theme Selection
+#
+# Windows, GNOME/Linux    Qute
+# MacOS X                 Pinstripe
+#
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+DIRS += themes/pinstripe
+else
+DIRS += themes/qute
+endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_INSTALLER
 DIRS += installer/windows
 
 # For Windows build the uninstaller during the application build since the
--- a/mail/makefiles.sh
+++ b/mail/makefiles.sh
@@ -51,22 +51,17 @@ 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/smime/Makefile
 mail/installer/Makefile
 mail/installer/windows/Makefile
-mail/themes/Makefile
-mail/themes/pinstripe/mail/Makefile
-mail/themes/pinstripe/editor/Makefile
 mail/themes/pinstripe/Makefile
-mail/themes/qute/mail/Makefile
-mail/themes/qute/editor/Makefile
 mail/themes/qute/Makefile
 "
 
 if test -n "$MOZ_BRANDING_DIRECTORY"; then
   add_makefiles "
     $MOZ_BRANDING_DIRECTORY/Makefile
     $MOZ_BRANDING_DIRECTORY/locales/Makefile
   "
deleted file mode 100644
--- a/mail/themes/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-# ***** 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 the Thunderbird Theme code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Scott MacGregor <mscott@mozilla.org>
-#
-# 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
-# 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
-
-#
-# Theme Selection
-#
-# Windows, GNOME/Linux    Qute
-# MacOS X                 Pinstripe
-#
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-DIRS = pinstripe
-else
-DIRS = qute
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/mail/themes/pinstripe/Makefile.in
+++ b/mail/themes/pinstripe/Makefile.in
@@ -37,11 +37,9 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = editor mail
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mail/themes/pinstripe/editor/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** 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 the Thunderbird Theme code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Scott MacGregor <mscott@mozilla.org>
-#
-# 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
-# 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
deleted file mode 100644
--- a/mail/themes/pinstripe/editor/jar.mn
+++ /dev/null
@@ -1,12 +0,0 @@
-classic.jar:
-% skin editor classic/1.0 %skin/classic/editor/
-  skin/classic/editor/editor.css
-  skin/classic/editor/EditorDialog.css
-  skin/classic/editor/EdImageMapPage.css
-  skin/classic/editor/EdImageMap.css
-  skin/classic/editor/textEditor.css
-  skin/classic/editor/icons/img-align-bottom.gif
-  skin/classic/editor/icons/img-align-left.gif
-  skin/classic/editor/icons/img-align-middle.gif
-  skin/classic/editor/icons/img-align-right.gif
-  skin/classic/editor/icons/img-align-top.gif
rename from mail/themes/pinstripe/mail/jar.mn
rename to mail/themes/pinstripe/jar.mn
--- a/mail/themes/pinstripe/mail/jar.mn
+++ b/mail/themes/pinstripe/jar.mn
@@ -1,303 +1,314 @@
 classic.jar:
 % skin messenger classic/1.0 %skin/classic/messenger/
-     skin/classic/messenger/dialogs.css 
-     skin/classic/messenger/messenger.css
-     skin/classic/messenger/primaryToolbar.css
-     skin/classic/messenger/accountCentral.css
-     skin/classic/messenger/accountManage.css
-     skin/classic/messenger/accountWizard.css
-     skin/classic/messenger/messageHeader.css
-     skin/classic/messenger/messageWindow.css
-     skin/classic/messenger/messageBody.css
-     skin/classic/messenger/msgSelectOffline.css
-     skin/classic/messenger/mailWindow1.css
-     skin/classic/messenger/searchBox.css
-     skin/classic/messenger/tagColors.css
-     skin/classic/messenger/junkMail.css
-     skin/classic/messenger/folderMenus.css
-     skin/classic/messenger/folderPane.css
-     skin/classic/messenger/subscribe.css
-     skin/classic/messenger/virtualFolderListDialog.css
-     skin/classic/messenger/searchDialog.css
-     skin/classic/messenger/filterDialog.css
-*    skin/classic/messenger/tabmailBindings.xml
-     skin/classic/messenger/tabmail.css
-     skin/classic/messenger/editContactOverlay.css
-     skin/classic/messenger/starred48.png
-     skin/classic/messenger/starIcons.png
-     skin/classic/messenger/hud-style-button-middle-background.png
-     skin/classic/messenger/addressbook/addressbook.css             (addrbook/addressbook.css)
-     skin/classic/messenger/addressbook/abContactsPanel.css         (addrbook/abContactsPanel.css)
-     skin/classic/messenger/addressbook/cardDialog.css              (addrbook/cardDialog.css)
-     skin/classic/messenger/addressbook/abResultsPane.css           (addrbook/abResultsPane.css)
-     skin/classic/messenger/addressbook/icons/abcard.png            (addrbook/abcard.png)
-     skin/classic/messenger/addressbook/icons/ablist.png            (addrbook/ablist.png) 
-     skin/classic/messenger/addressbook/icons/addressbook-toolbar.png         (addrbook/addressbook-toolbar.png)
-     skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (addrbook/addressbook-toolbar-small.png)
-     skin/classic/messenger/addressbook/icons/abcard.png            (addrbook/abcard.png)
-     skin/classic/messenger/addressbook/icons/ablist.png            (addrbook/ablist.png)
-     skin/classic/messenger/addressbook/icons/addrbook.png          (addrbook/addrbook.png)
-     skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png  (addrbook/addressbook-toolbar-small.png)
-     skin/classic/messenger/addressbook/icons/addressbook-toolbar.png        (addrbook/addressbook-toolbar.png)
-     skin/classic/messenger/addressbook/icons/advanced-search-pressed.png     (addrbook/advanced-search-pressed.png)
-     skin/classic/messenger/addressbook/icons/advanced-search.png   (addrbook/advanced-search.png)
-     skin/classic/messenger/addressbook/icons/remote-addrbook-error.png      (addrbook/remote-addrbook-error.png)
-     skin/classic/messenger/addressbook/icons/remote-addrbook.png   (addrbook/remote-addrbook.png)
-     skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png     (addrbook/secure-remote-addrbook.png)
-     skin/classic/messenger/messengercompose/messengercompose.css    (compose/messengercompose.css)
-     skin/classic/messenger/messengercompose/compose-toolbar.png     (compose/compose-toolbar.png)
-     skin/classic/messenger/messengercompose/compose-toolbar-small.png        (compose/compose-toolbar-small.png)
-     skin/classic/messenger/messengercompose/button-face-italic-disabled.png  (compose/button-face-italic-disabled.png)
-     skin/classic/messenger/messengercompose/button-face-italic.png  (compose/button-face-italic.png)
-     skin/classic/messenger/messengercompose/button-face-smiley-disabled.png  (compose/button-face-smiley-disabled.png)
-     skin/classic/messenger/messengercompose/button-face-smiley.png  (compose/button-face-smiley.png)
-     skin/classic/messenger/messengercompose/emoticon_cool.png       (compose/emoticon_cool.png)
-     skin/classic/messenger/messengercompose/emoticon_cry.png        (compose/emoticon_cry.png)
-     skin/classic/messenger/messengercompose/emoticon_embarrassed.png         (compose/emoticon_embarrassed.png)
-     skin/classic/messenger/messengercompose/emoticon_foot_in_mouth.png       (compose/emoticon_foot_in_mouth.png)
-     skin/classic/messenger/messengercompose/emoticon_frown.png      (compose/emoticon_frown.png)
-     skin/classic/messenger/messengercompose/emoticon_innocent.png   (compose/emoticon_innocent.png)
-     skin/classic/messenger/messengercompose/emoticon_kiss.png       (compose/emoticon_kiss.png)
-     skin/classic/messenger/messengercompose/emoticon_laughing.png   (compose/emoticon_laughing.png)
-     skin/classic/messenger/messengercompose/emoticon_money_mouth.png         (compose/emoticon_money_mouth.png)
-     skin/classic/messenger/messengercompose/emoticon_sealed.png     (compose/emoticon_sealed.png)
-     skin/classic/messenger/messengercompose/emoticon_smile.png      (compose/emoticon_smile.png)
-     skin/classic/messenger/messengercompose/emoticon_surprised.png  (compose/emoticon_surprised.png)
-     skin/classic/messenger/messengercompose/emoticon_tongue_out.png (compose/emoticon_tongue_out.png)
-     skin/classic/messenger/messengercompose/emoticon_undecided.png  (compose/emoticon_undecided.png)
-     skin/classic/messenger/messengercompose/emoticon_wink.png       (compose/emoticon_wink.png)
-     skin/classic/messenger/messengercompose/emoticon_yell.png       (compose/emoticon_yell.png)
-     skin/classic/messenger/messengercompose/format-buttons.png      (compose/format-buttons.png)
-     skin/classic/messenger/messengercompose/insert-menu.png         (compose/insert-menu.png)
-     skin/classic/messenger/messengercompose/left-button-base.png    (compose/left-button-base.png)
-     skin/classic/messenger/messengercompose/left-button-disabled.png         (compose/left-button-disabled.png)
-     skin/classic/messenger/messengercompose/left-button-pressed.png (compose/left-button-pressed.png)
-     skin/classic/messenger/messengercompose/mid-button-base.png     (compose/mid-button-base.png)
-     skin/classic/messenger/messengercompose/mid-button-disabled.png (compose/mid-button-disabled.png)
-     skin/classic/messenger/messengercompose/mid-button-pressed.png  (compose/mid-button-pressed.png)
-     skin/classic/messenger/messengercompose/right-button-base.png   (compose/right-button-base.png)
-     skin/classic/messenger/messengercompose/right-button-disabled.png        (compose/right-button-disabled.png)
-     skin/classic/messenger/messengercompose/right-button-pressed.png         (compose/right-button-pressed.png)
-     skin/classic/messenger/messengercompose/small-button-base.png   (compose/small-button-base.png)
-     skin/classic/messenger/messengercompose/small-button-disabled.png        (compose/small-button-disabled.png)
-     skin/classic/messenger/messengercompose/small-button-pressed.png         (compose/small-button-pressed.png)
+  skin/classic/messenger/dialogs.css                             (mail/dialogs.css)
+  skin/classic/messenger/messenger.css                           (mail/messenger.css)
+  skin/classic/messenger/primaryToolbar.css                      (mail/primaryToolbar.css)
+  skin/classic/messenger/accountCentral.css                      (mail/accountCentral.css)
+  skin/classic/messenger/accountManage.css                       (mail/accountManage.css)
+  skin/classic/messenger/accountWizard.css                       (mail/accountWizard.css)
+  skin/classic/messenger/messageHeader.css                       (mail/messageHeader.css)
+  skin/classic/messenger/messageWindow.css                       (mail/messageWindow.css)
+  skin/classic/messenger/messageBody.css                         (mail/messageBody.css)
+  skin/classic/messenger/msgSelectOffline.css                    (mail/msgSelectOffline.css)
+  skin/classic/messenger/mailWindow1.css                         (mail/mailWindow1.css)
+  skin/classic/messenger/searchBox.css                           (mail/searchBox.css)
+  skin/classic/messenger/tagColors.css                           (mail/tagColors.css)
+  skin/classic/messenger/junkMail.css                            (mail/junkMail.css)
+  skin/classic/messenger/folderMenus.css                         (mail/folderMenus.css)
+  skin/classic/messenger/folderPane.css                          (mail/folderPane.css)
+  skin/classic/messenger/subscribe.css                           (mail/subscribe.css)
+  skin/classic/messenger/virtualFolderListDialog.css             (mail/virtualFolderListDialog.css)
+  skin/classic/messenger/searchDialog.css                        (mail/searchDialog.css)
+  skin/classic/messenger/filterDialog.css                        (mail/filterDialog.css)
+* skin/classic/messenger/tabmailBindings.xml                     (mail/tabmailBindings.xml)
+  skin/classic/messenger/tabmail.css                             (mail/tabmail.css)
+  skin/classic/messenger/editContactOverlay.css                  (mail/editContactOverlay.css)
+  skin/classic/messenger/starred48.png                           (mail/starred48.png)
+  skin/classic/messenger/starIcons.png                           (mail/starIcons.png)
+  skin/classic/messenger/hud-style-button-middle-background.png  (mail/hud-style-button-middle-background.png)
+  skin/classic/messenger/addressbook/addressbook.css             (mail/addrbook/addressbook.css)
+  skin/classic/messenger/addressbook/abContactsPanel.css         (mail/addrbook/abContactsPanel.css)
+  skin/classic/messenger/addressbook/cardDialog.css              (mail/addrbook/cardDialog.css)
+  skin/classic/messenger/addressbook/abResultsPane.css           (mail/addrbook/abResultsPane.css)
+  skin/classic/messenger/addressbook/icons/abcard.png            (mail/addrbook/abcard.png)
+  skin/classic/messenger/addressbook/icons/ablist.png            (mail/addrbook/ablist.png) 
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar.png         (mail/addrbook/addressbook-toolbar.png)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (mail/addrbook/addressbook-toolbar-small.png)
+  skin/classic/messenger/addressbook/icons/abcard.png            (mail/addrbook/abcard.png)
+  skin/classic/messenger/addressbook/icons/ablist.png            (mail/addrbook/ablist.png)
+  skin/classic/messenger/addressbook/icons/addrbook.png          (mail/addrbook/addrbook.png)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png  (mail/addrbook/addressbook-toolbar-small.png)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar.png        (mail/addrbook/addressbook-toolbar.png)
+  skin/classic/messenger/addressbook/icons/advanced-search-pressed.png     (mail/addrbook/advanced-search-pressed.png)
+  skin/classic/messenger/addressbook/icons/advanced-search.png   (mail/addrbook/advanced-search.png)
+  skin/classic/messenger/addressbook/icons/remote-addrbook-error.png      (mail/addrbook/remote-addrbook-error.png)
+  skin/classic/messenger/addressbook/icons/remote-addrbook.png   (mail/addrbook/remote-addrbook.png)
+  skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png     (mail/addrbook/secure-remote-addrbook.png)
+  skin/classic/messenger/messengercompose/messengercompose.css    (mail/compose/messengercompose.css)
+  skin/classic/messenger/messengercompose/compose-toolbar.png     (mail/compose/compose-toolbar.png)
+  skin/classic/messenger/messengercompose/compose-toolbar-small.png        (mail/compose/compose-toolbar-small.png)
+  skin/classic/messenger/messengercompose/button-face-italic-disabled.png  (mail/compose/button-face-italic-disabled.png)
+  skin/classic/messenger/messengercompose/button-face-italic.png  (mail/compose/button-face-italic.png)
+  skin/classic/messenger/messengercompose/button-face-smiley-disabled.png  (mail/compose/button-face-smiley-disabled.png)
+  skin/classic/messenger/messengercompose/button-face-smiley.png  (mail/compose/button-face-smiley.png)
+  skin/classic/messenger/messengercompose/emoticon_cool.png       (mail/compose/emoticon_cool.png)
+  skin/classic/messenger/messengercompose/emoticon_cry.png        (mail/compose/emoticon_cry.png)
+  skin/classic/messenger/messengercompose/emoticon_embarrassed.png         (mail/compose/emoticon_embarrassed.png)
+  skin/classic/messenger/messengercompose/emoticon_foot_in_mouth.png       (mail/compose/emoticon_foot_in_mouth.png)
+  skin/classic/messenger/messengercompose/emoticon_frown.png      (mail/compose/emoticon_frown.png)
+  skin/classic/messenger/messengercompose/emoticon_innocent.png   (mail/compose/emoticon_innocent.png)
+  skin/classic/messenger/messengercompose/emoticon_kiss.png       (mail/compose/emoticon_kiss.png)
+  skin/classic/messenger/messengercompose/emoticon_laughing.png   (mail/compose/emoticon_laughing.png)
+  skin/classic/messenger/messengercompose/emoticon_money_mouth.png         (mail/compose/emoticon_money_mouth.png)
+  skin/classic/messenger/messengercompose/emoticon_sealed.png     (mail/compose/emoticon_sealed.png)
+  skin/classic/messenger/messengercompose/emoticon_smile.png      (mail/compose/emoticon_smile.png)
+  skin/classic/messenger/messengercompose/emoticon_surprised.png  (mail/compose/emoticon_surprised.png)
+  skin/classic/messenger/messengercompose/emoticon_tongue_out.png (mail/compose/emoticon_tongue_out.png)
+  skin/classic/messenger/messengercompose/emoticon_undecided.png  (mail/compose/emoticon_undecided.png)
+  skin/classic/messenger/messengercompose/emoticon_wink.png       (mail/compose/emoticon_wink.png)
+  skin/classic/messenger/messengercompose/emoticon_yell.png       (mail/compose/emoticon_yell.png)
+  skin/classic/messenger/messengercompose/format-buttons.png      (mail/compose/format-buttons.png)
+  skin/classic/messenger/messengercompose/insert-menu.png         (mail/compose/insert-menu.png)
+  skin/classic/messenger/messengercompose/left-button-base.png    (mail/compose/left-button-base.png)
+  skin/classic/messenger/messengercompose/left-button-disabled.png         (mail/compose/left-button-disabled.png)
+  skin/classic/messenger/messengercompose/left-button-pressed.png (mail/compose/left-button-pressed.png)
+  skin/classic/messenger/messengercompose/mid-button-base.png     (mail/compose/mid-button-base.png)
+  skin/classic/messenger/messengercompose/mid-button-disabled.png (mail/compose/mid-button-disabled.png)
+  skin/classic/messenger/messengercompose/mid-button-pressed.png  (mail/compose/mid-button-pressed.png)
+  skin/classic/messenger/messengercompose/right-button-base.png   (mail/compose/right-button-base.png)
+  skin/classic/messenger/messengercompose/right-button-disabled.png        (mail/compose/right-button-disabled.png)
+  skin/classic/messenger/messengercompose/right-button-pressed.png         (mail/compose/right-button-pressed.png)
+  skin/classic/messenger/messengercompose/small-button-base.png   (mail/compose/small-button-base.png)
+  skin/classic/messenger/messengercompose/small-button-disabled.png        (mail/compose/small-button-disabled.png)
+  skin/classic/messenger/messengercompose/small-button-pressed.png         (mail/compose/small-button-pressed.png)
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
-     skin/classic/messenger-newsblog/feed-subscriptions.css         (newsblog/feed-subscriptions.css)
-     skin/classic/messenger-newsblog/icons/folder-search-rss.png    (newsblog/folder-search-rss.png)
-     skin/classic/messenger/preferences/preferences.css             (preferences/preferences.css)
-     skin/classic/messenger/preferences/mail-options.png            (preferences/mail-options.png)
-     skin/classic/messenger/preferences/radio-selected-bg.png       (preferences/radio-selected-bg.png)
-     skin/classic/messenger/smime/msgCompSMIMEOverlay.css           (smime/msgCompSMIMEOverlay.css)
-     skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css        (smime/msgHdrViewSMIMEOverlay.css)
-     skin/classic/messenger/smime/msgReadSMIMEOverlay.css           (smime/msgReadSMIMEOverlay.css)
-     skin/classic/messenger/smime/msgReadSecurityInfo.css           (smime/msgReadSecurityInfo.css)
-     skin/classic/messenger/smime/msgCompSecurityInfo.css           (smime/msgCompSecurityInfo.css)
-     skin/classic/messenger/smime/certFetchingStatus.css            (smime/certFetchingStatus.css)
-     skin/classic/messenger/smime/icons/sbSignOk.gif                (smime/sbSignOk.gif)
-     skin/classic/messenger/smime/icons/sbSignUnknown.gif           (smime/sbSignUnknown.gif)
-     skin/classic/messenger/smime/icons/sbSignNotOk.gif             (smime/sbSignNotOk.gif)
-     skin/classic/messenger/smime/icons/sbCryptoOk.gif              (smime/sbCryptoOk.gif)
-     skin/classic/messenger/smime/icons/sbCryptoNotOk.gif           (smime/sbCryptoNotOk.gif)
-     skin/classic/messenger/smime/icons/hdrSignOk.gif               (smime/hdrSignOk.gif)
-     skin/classic/messenger/smime/icons/hdrSignUnknown.gif          (smime/hdrSignUnknown.gif)
-     skin/classic/messenger/smime/icons/hdrSignNotOk.gif            (smime/hdrSignNotOk.gif)
-     skin/classic/messenger/smime/icons/hdrCryptoOk.gif             (smime/hdrCryptoOk.gif)
-     skin/classic/messenger/smime/icons/hdrCryptoNotOk.gif          (smime/hdrCryptoNotOk.gif)
-     skin/classic/messenger/icons/chevron.png                       (icons/chevron.png)
-     skin/classic/messenger/icons/twisty-open.gif                   (icons/twisty-open.gif)
-     skin/classic/messenger/icons/twisty-closed.gif                 (icons/twisty-closed.gif)
-     skin/classic/messenger/icons/spin-buttons-active.png           (icons/spin-buttons-active.png)
-     skin/classic/messenger/icons/spin-buttons.png                  (icons/spin-buttons.png)
-     skin/classic/messenger/icons/tree-selected-overlay.png         (icons/tree-selected-overlay.png)
-     skin/classic/messenger/icons/SearchBarStart.png                (icons/SearchBarStart.png)
-     skin/classic/messenger/icons/SearchBarStart-rtl.png            (icons/SearchBarStart-rtl.png)
-     skin/classic/messenger/icons/SearchBarMiddle.png               (icons/SearchBarMiddle.png)
-     skin/classic/messenger/icons/SearchBarEnd.png                  (icons/SearchBarEnd.png)
-     skin/classic/messenger/icons/SearchBarEnd-rtl.png              (icons/SearchBarEnd-rtl.png)
-     skin/classic/messenger/icons/search-bar-background.png         (icons/search-bar-background.png)
-     skin/classic/messenger/icons/Search-bar.png                    (icons/Search-bar.png)
-     skin/classic/messenger/icons/message-mail-attach-del.gif       (icons/message-mail-attach-del.gif)
-     skin/classic/messenger/icons/attachment-col.png                (icons/attachment-col.png)
-     skin/classic/messenger/icons/attachment-selected.png           (icons/attachment-selected.png)
-     skin/classic/messenger/icons/attachment.png                    (icons/attachment.png)
-     skin/classic/messenger/icons/check.png                         (icons/check.png)
-     skin/classic/messenger/icons/dot.png                           (icons/dot.png)
-     skin/classic/messenger/icons/flagcol.png                       (icons/flagcol.png)
-     skin/classic/messenger/icons/flaggedmail.png                   (icons/flaggedmail.png)
-     skin/classic/messenger/icons/folder-closed.png                 (icons/folder-closed.png)
-     skin/classic/messenger/icons/folder-draft.png                  (icons/folder-draft.png)
-     skin/classic/messenger/icons/folder-inbox.png                  (icons/folder-inbox.png)
-     skin/classic/messenger/icons/folder-junk.png                   (icons/folder-junk.png)
-     skin/classic/messenger/icons/folder-newsgroup.png              (icons/folder-newsgroup.png)
-     skin/classic/messenger/icons/folder-open.png                   (icons/folder-open.png)
-     skin/classic/messenger/icons/folder-outbox.png                 (icons/folder-outbox.png)
-     skin/classic/messenger/icons/folder-sent.png                   (icons/folder-sent.png)
-     skin/classic/messenger/icons/folder-share.png                  (icons/folder-share.png)
-     skin/classic/messenger/icons/folder-template.png               (icons/folder-template.png)
-     skin/classic/messenger/icons/folder-trash.png                  (icons/folder-trash.png)
-     skin/classic/messenger/icons/foldertree-selected-background.png  (icons/foldertree-selected-background.png)
-     skin/classic/messenger/icons/foldertree-selected-unfocused.png (icons/foldertree-selected-unfocused.png)
-     skin/classic/messenger/icons/group-background.gif              (icons/group-background.gif)
-     skin/classic/messenger/icons/junk-column-header.png            (icons/junk-column-header.png)
-     skin/classic/messenger/icons/local-mailhost.png                (icons/local-mailhost.png)
-     skin/classic/messenger/icons/mail-16.png                       (icons/mail-16.png)
-     skin/classic/messenger/icons/mail-toolbar-small.png            (icons/mail-toolbar-small.png)
-     skin/classic/messenger/icons/mail-toolbar.png                  (icons/mail-toolbar.png)
-     skin/classic/messenger/icons/message-mail-attach-offl.png      (icons/message-mail-attach-offl.png)
-     skin/classic/messenger/icons/message-mail-attach.png           (icons/message-mail-attach.png)
-     skin/classic/messenger/icons/message-mail-imapdel-offl.png     (icons/message-mail-imapdel-offl.png)
-     skin/classic/messenger/icons/message-mail-imapdelete.png       (icons/message-mail-imapdelete.png)
-     skin/classic/messenger/icons/message-mail-new.png              (icons/message-mail-new.png)
-     skin/classic/messenger/icons/message-mail-offl.png             (icons/message-mail-offl.png)
-     skin/classic/messenger/icons/message-mail.png                  (icons/message-mail.png)
-     skin/classic/messenger/icons/message-new-background.png        (icons/message-new-background.png)
-     skin/classic/messenger/icons/message-news-attach-offl.png      (icons/message-news-attach-offl.png)
-     skin/classic/messenger/icons/message-news-attach.png           (icons/message-news-attach.png)
-     skin/classic/messenger/icons/message-news-new-attach-off.png   (icons/message-news-new-attach-off.png)
-     skin/classic/messenger/icons/message-news-new-attach.png       (icons/message-news-new-attach.png)
-     skin/classic/messenger/icons/message-news-new-offl.png         (icons/message-news-new-offl.png)
-     skin/classic/messenger/icons/message-news-new.png              (icons/message-news-new.png)
-     skin/classic/messenger/icons/message-news-offl.png             (icons/message-news-offl.png)
-     skin/classic/messenger/icons/message-news.png                  (icons/message-news.png)
-     skin/classic/messenger/icons/new-mail-alert.png                (icons/new-mail-alert.png)
-     skin/classic/messenger/icons/readcol.png                       (icons/readcol.png)
-     skin/classic/messenger/icons/readmail.png                      (icons/readmail.png)
-     skin/classic/messenger/icons/saved-search-folder.png           (icons/saved-search-folder.png)
-     skin/classic/messenger/icons/server-local-new.png              (icons/server-local-new.png)
-     skin/classic/messenger/icons/server-local.png                  (icons/server-local.png)
-     skin/classic/messenger/icons/server-mail-new.png               (icons/server-mail-new.png)
-     skin/classic/messenger/icons/server-mail.png                   (icons/server-mail.png)
-     skin/classic/messenger/icons/server-news-lock.png              (icons/server-news-lock.png)
-     skin/classic/messenger/icons/server-news-new.png               (icons/server-news-new.png)
-     skin/classic/messenger/icons/server-news.png                   (icons/server-news.png)
-     skin/classic/messenger/icons/server-newsblog.png               (icons/server-newsblog.png)
-     skin/classic/messenger/icons/server-remote-lock.png            (icons/server-remote-lock.png)
-     skin/classic/messenger/icons/symbol-forwarded.png              (icons/symbol-forwarded.png)
-     skin/classic/messenger/icons/symbol-forwarded-selected.png     (icons/symbol-forwarded-selected.png)
-     skin/classic/messenger/icons/symbol-replied.png                (icons/symbol-replied.png)
-     skin/classic/messenger/icons/symbol-replied-selected.png       (icons/symbol-replied-selected.png)
-     skin/classic/messenger/icons/symbol-imapdeleted.png            (icons/symbol-imapdeleted.png)
-     skin/classic/messenger/icons/symbol-imapdeleted-selected.png   (icons/symbol-imapdeleted-selected.png)
-     skin/classic/messenger/icons/symbol-null.png                   (icons/symbol-null.png)
-     skin/classic/messenger/icons/template-folder.png               (icons/template-folder.png)
-     skin/classic/messenger/icons/thread-closed-eye-selected.png    (icons/thread-closed-eye-selected.png)
-     skin/classic/messenger/icons/thread-closed-eye.png             (icons/thread-closed-eye.png)
-     skin/classic/messenger/icons/thread-closed-kill.png            (icons/thread-closed-kill.png)
-     skin/classic/messenger/icons/message-closed-kill.png           (icons/message-closed-kill.png)
-     skin/classic/messenger/icons/thread-closed-offl-eye.png        (icons/thread-closed-offl-eye.png)
-     skin/classic/messenger/icons/thread-closed-offl-kill.png       (icons/thread-closed-offl-kill.png)
-     skin/classic/messenger/icons/thread-closed-selected.png        (icons/thread-closed-selected.png)
-     skin/classic/messenger/icons/thread-closed.png                 (icons/thread-closed.png)
-     skin/classic/messenger/icons/thread-new-closed-eye.png         (icons/thread-new-closed-eye.png)
-     skin/classic/messenger/icons/thread-new-closed-kill.png        (icons/thread-new-closed-kill.png)
-     skin/classic/messenger/icons/message-new-closed-kill.png       (icons/message-new-closed-kill.png)
-     skin/classic/messenger/icons/thread-new-closed-offl-eye.png    (icons/thread-new-closed-offl-eye.png)
-     skin/classic/messenger/icons/thread-new-closed-offl-kill.png   (icons/thread-new-closed-offl-kill.png)
-     skin/classic/messenger/icons/thread-new-closed.png             (icons/thread-new-closed.png)
-     skin/classic/messenger/icons/threadcol.png                     (icons/threadcol.png)
-     skin/classic/messenger/icons/threadpane-splitter-bg.gif        (icons/threadpane-splitter-bg.gif)
-     skin/classic/messenger/icons/unreadmail-selected.png           (icons/unreadmail-selected.png)
-     skin/classic/messenger/icons/unreadmail.png                    (icons/unreadmail.png)
-     skin/classic/messenger/icons/unthreadcol.png                   (icons/unthreadcol.png)
-     skin/classic/messenger/icons/online.png                        (icons/online.png)
-     skin/classic/messenger/icons/offline.png                       (icons/offline.png)
-     skin/classic/messenger/icons/warning.png                       (icons/warning.png)
-     skin/classic/messenger/icons/arrow-dn-7.png                    (icons/arrow-dn-7.png)
-     skin/classic/messenger/icons/top-toolbar-background.gif        (icons/top-toolbar-background.gif)
-    skin/classic/messenger/icons/alltabs-box-bkgnd.png                  (icons/alltabs-box-bkgnd.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-bkgnd.png         (icons/alltabs-box-overflow-bkgnd.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-bkgnd-animate.png (icons/alltabs-box-overflow-bkgnd-animate.png)
-    skin/classic/messenger/icons/tab-arrow-start.png                    (icons/tab-arrow-start.png)
-    skin/classic/messenger/icons/tab-arrow-start-bkgnd.png              (icons/tab-arrow-start-bkgnd.png)
-    skin/classic/messenger/icons/tab-arrow-start-bkgnd-animate.png      (icons/tab-arrow-start-bkgnd-animate.png)
-    skin/classic/messenger/icons/tab-arrow-end.png                      (icons/tab-arrow-end.png)
-    skin/classic/messenger/icons/tab-arrow-end-bkgnd.png                (icons/tab-arrow-end-bkgnd.png)
-    skin/classic/messenger/icons/tab-arrow-end-bkgnd-animate.png        (icons/tab-arrow-end-bkgnd-animate.png)
-    skin/classic/messenger/icons/tabmail-tabs-bkgnd.png                 (icons/tabmail-tabs-bkgnd.png)
-    skin/classic/messenger/icons/tabDragIndicator.png                   (icons/tabDragIndicator.png)
-    skin/classic/messenger/icons/tab-left.png                           (icons/tab-left.png)
-    skin/classic/messenger/icons/tab-left-bkgnd.png                     (icons/tab-left-bkgnd.png)
-    skin/classic/messenger/icons/tab-left-hover.png                     (icons/tab-left-hover.png)
-    skin/classic/messenger/icons/tab-middle.png                         (icons/tab-middle.png)
-    skin/classic/messenger/icons/tab-middle-bkgnd.png                   (icons/tab-middle-bkgnd.png)
-    skin/classic/messenger/icons/tab-middle-hover.png                   (icons/tab-middle-hover.png)
-    skin/classic/messenger/icons/tab-right.png                          (icons/tab-right.png)
-    skin/classic/messenger/icons/tab-right-bkgnd.png                    (icons/tab-right-bkgnd.png)
-    skin/classic/messenger/icons/tab-right-hover.png                    (icons/tab-right-hover.png)
-    skin/classic/messenger/icons/tabs-bottom-bg.png                     (icons/tabs-bottom-bg.png)
-    skin/classic/messenger/tabs/alltabs-box-bkgnd-icon.png              (tabs/alltabs-box-bkgnd-icon.png)
-    skin/classic/messenger/tabs/alltabs-box-bkgnd.png                   (tabs/alltabs-box-bkgnd.png)
-    skin/classic/messenger/tabs/alltabs-box-overflow-bkgnd-animate.png  (tabs/alltabs-box-overflow-bkgnd-animate.png)
-    skin/classic/messenger/tabs/alltabs-box-overflow-bkgnd.png          (tabs/alltabs-box-overflow-bkgnd.png)
-    skin/classic/messenger/tabs/newtab.png                              (tabs/newtab.png)
-    skin/classic/messenger/tabs/tab-arrow-end-bkgnd-animate.png         (tabs/tab-arrow-end-bkgnd-animate.png)
-    skin/classic/messenger/tabs/tab-arrow-end-bkgnd.png                 (tabs/tab-arrow-end-bkgnd.png)
-    skin/classic/messenger/tabs/tab-arrow-end.png                       (tabs/tab-arrow-end.png)
-    skin/classic/messenger/tabs/tab-arrow-start-bkgnd-animate.png       (tabs/tab-arrow-start-bkgnd-animate.png)
-    skin/classic/messenger/tabs/tab-arrow-start-bkgnd.png               (tabs/tab-arrow-start-bkgnd.png)
-    skin/classic/messenger/tabs/tab-arrow-start.png                     (tabs/tab-arrow-start.png)
-    skin/classic/messenger/tabs/tab-bkgnd.png                           (tabs/tab-bkgnd.png)
-    skin/classic/messenger/tabs/tab-left-bkgnd.png                      (tabs/tab-left-bkgnd.png)
-    skin/classic/messenger/tabs/tab-left-hover.png                      (tabs/tab-left-hover.png)
-    skin/classic/messenger/tabs/tab-left-inactive.png                   (tabs/tab-left-inactive.png)
-    skin/classic/messenger/tabs/tab-left.png                            (tabs/tab-left.png)
-    skin/classic/messenger/tabs/tab-middle-bkgnd.png                    (tabs/tab-middle-bkgnd.png)
-    skin/classic/messenger/tabs/tab-middle-hover.png                    (tabs/tab-middle-hover.png)
-    skin/classic/messenger/tabs/tab-middle-inactive.png                 (tabs/tab-middle-inactive.png)
-    skin/classic/messenger/tabs/tab-middle.png                          (tabs/tab-middle.png)
-    skin/classic/messenger/tabs/tab-right-bkgnd.png                     (tabs/tab-right-bkgnd.png)
-    skin/classic/messenger/tabs/tab-right-hover.png                     (tabs/tab-right-hover.png)
-    skin/classic/messenger/tabs/tab-right-inactive.png                  (tabs/tab-right-inactive.png)
-    skin/classic/messenger/tabs/tab-right.png                           (tabs/tab-right.png)
-    skin/classic/messenger/tabs/tabDragIndicator.png                    (tabs/tabDragIndicator.png)
-    skin/classic/messenger/tabs/tabbrowser-tabs-bkgnd.png               (tabs/tabbrowser-tabs-bkgnd.png)
-    skin/classic/messenger/tabs/tabs-bottom-bg.png                      (tabs/tabs-bottom-bg.png)
-    skin/classic/messenger/tabs/toolbar_background-inactive.png         (tabs/toolbar_background-inactive.png)
-    skin/classic/messenger/tabs/toolbar_background.gif                  (tabs/toolbar_background.gif)
-     skin/classic/messenger/accountcentral/accountsettings.png      (accountcentral/accountsettings.png)
-     skin/classic/messenger/accountcentral/folder.png               (accountcentral/folder.png)
-     skin/classic/messenger/accountcentral/getmail.png              (accountcentral/getmail.png)
-     skin/classic/messenger/accountcentral/junk.png                 (accountcentral/junk.png)
-     skin/classic/messenger/accountcentral/mailbox.png              (accountcentral/mailbox.png)
-     skin/classic/messenger/accountcentral/newaccount.png           (accountcentral/newaccount.png)
-     skin/classic/messenger/accountcentral/offline.png              (accountcentral/offline.png)
-     skin/classic/messenger/accountcentral/offline.png              (accountcentral/offline.png)
-     skin/classic/messenger/accountcentral/search-messages.png      (accountcentral/search-messages.png)
-     skin/classic/messenger/accountcentral/manage-subscriptions.png (accountcentral/manage-subscriptions.png)
-     skin/classic/messenger/accountcentral/manage-rss.png           (accountcentral/manage-rss.png)
-     skin/classic/messenger/accountcentral/writemail.png            (accountcentral/writemail.png)
+  skin/classic/messenger-newsblog/feed-subscriptions.css         (mail/newsblog/feed-subscriptions.css)
+  skin/classic/messenger-newsblog/icons/folder-search-rss.png    (mail/newsblog/folder-search-rss.png)
+  skin/classic/messenger/preferences/preferences.css             (mail/preferences/preferences.css)
+  skin/classic/messenger/preferences/mail-options.png            (mail/preferences/mail-options.png)
+  skin/classic/messenger/preferences/radio-selected-bg.png       (mail/preferences/radio-selected-bg.png)
+  skin/classic/messenger/smime/msgCompSMIMEOverlay.css           (mail/smime/msgCompSMIMEOverlay.css)
+  skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css        (mail/smime/msgHdrViewSMIMEOverlay.css)
+  skin/classic/messenger/smime/msgReadSMIMEOverlay.css           (mail/smime/msgReadSMIMEOverlay.css)
+  skin/classic/messenger/smime/msgReadSecurityInfo.css           (mail/smime/msgReadSecurityInfo.css)
+  skin/classic/messenger/smime/msgCompSecurityInfo.css           (mail/smime/msgCompSecurityInfo.css)
+  skin/classic/messenger/smime/certFetchingStatus.css            (mail/smime/certFetchingStatus.css)
+  skin/classic/messenger/smime/icons/sbSignOk.gif                (mail/smime/sbSignOk.gif)
+  skin/classic/messenger/smime/icons/sbSignUnknown.gif           (mail/smime/sbSignUnknown.gif)
+  skin/classic/messenger/smime/icons/sbSignNotOk.gif             (mail/smime/sbSignNotOk.gif)
+  skin/classic/messenger/smime/icons/sbCryptoOk.gif              (mail/smime/sbCryptoOk.gif)
+  skin/classic/messenger/smime/icons/sbCryptoNotOk.gif           (mail/smime/sbCryptoNotOk.gif)
+  skin/classic/messenger/smime/icons/hdrSignOk.gif               (mail/smime/hdrSignOk.gif)
+  skin/classic/messenger/smime/icons/hdrSignUnknown.gif          (mail/smime/hdrSignUnknown.gif)
+  skin/classic/messenger/smime/icons/hdrSignNotOk.gif            (mail/smime/hdrSignNotOk.gif)
+  skin/classic/messenger/smime/icons/hdrCryptoOk.gif             (mail/smime/hdrCryptoOk.gif)
+  skin/classic/messenger/smime/icons/hdrCryptoNotOk.gif          (mail/smime/hdrCryptoNotOk.gif)
+  skin/classic/messenger/icons/chevron.png                       (mail/icons/chevron.png)
+  skin/classic/messenger/icons/twisty-open.gif                   (mail/icons/twisty-open.gif)
+  skin/classic/messenger/icons/twisty-closed.gif                 (mail/icons/twisty-closed.gif)
+  skin/classic/messenger/icons/spin-buttons-active.png           (mail/icons/spin-buttons-active.png)
+  skin/classic/messenger/icons/spin-buttons.png                  (mail/icons/spin-buttons.png)
+  skin/classic/messenger/icons/tree-selected-overlay.png         (mail/icons/tree-selected-overlay.png)
+  skin/classic/messenger/icons/SearchBarStart.png                (mail/icons/SearchBarStart.png)
+  skin/classic/messenger/icons/SearchBarStart-rtl.png            (mail/icons/SearchBarStart-rtl.png)
+  skin/classic/messenger/icons/SearchBarMiddle.png               (mail/icons/SearchBarMiddle.png)
+  skin/classic/messenger/icons/SearchBarEnd.png                  (mail/icons/SearchBarEnd.png)
+  skin/classic/messenger/icons/SearchBarEnd-rtl.png              (mail/icons/SearchBarEnd-rtl.png)
+  skin/classic/messenger/icons/search-bar-background.png         (mail/icons/search-bar-background.png)
+  skin/classic/messenger/icons/Search-bar.png                    (mail/icons/Search-bar.png)
+  skin/classic/messenger/icons/message-mail-attach-del.gif       (mail/icons/message-mail-attach-del.gif)
+  skin/classic/messenger/icons/attachment-col.png                (mail/icons/attachment-col.png)
+  skin/classic/messenger/icons/attachment-selected.png           (mail/icons/attachment-selected.png)
+  skin/classic/messenger/icons/attachment.png                    (mail/icons/attachment.png)
+  skin/classic/messenger/icons/check.png                         (mail/icons/check.png)
+  skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
+  skin/classic/messenger/icons/flagcol.png                       (mail/icons/flagcol.png)
+  skin/classic/messenger/icons/flaggedmail.png                   (mail/icons/flaggedmail.png)
+  skin/classic/messenger/icons/folder-closed.png                 (mail/icons/folder-closed.png)
+  skin/classic/messenger/icons/folder-draft.png                  (mail/icons/folder-draft.png)
+  skin/classic/messenger/icons/folder-inbox.png                  (mail/icons/folder-inbox.png)
+  skin/classic/messenger/icons/folder-junk.png                   (mail/icons/folder-junk.png)
+  skin/classic/messenger/icons/folder-newsgroup.png              (mail/icons/folder-newsgroup.png)
+  skin/classic/messenger/icons/folder-open.png                   (mail/icons/folder-open.png)
+  skin/classic/messenger/icons/folder-outbox.png                 (mail/icons/folder-outbox.png)
+  skin/classic/messenger/icons/folder-sent.png                   (mail/icons/folder-sent.png)
+  skin/classic/messenger/icons/folder-share.png                  (mail/icons/folder-share.png)
+  skin/classic/messenger/icons/folder-template.png               (mail/icons/folder-template.png)
+  skin/classic/messenger/icons/folder-trash.png                  (mail/icons/folder-trash.png)
+  skin/classic/messenger/icons/foldertree-selected-background.png  (mail/icons/foldertree-selected-background.png)
+  skin/classic/messenger/icons/foldertree-selected-unfocused.png (mail/icons/foldertree-selected-unfocused.png)
+  skin/classic/messenger/icons/group-background.gif              (mail/icons/group-background.gif)
+  skin/classic/messenger/icons/junk-column-header.png            (mail/icons/junk-column-header.png)
+  skin/classic/messenger/icons/local-mailhost.png                (mail/icons/local-mailhost.png)
+  skin/classic/messenger/icons/mail-16.png                       (mail/icons/mail-16.png)
+  skin/classic/messenger/icons/mail-toolbar-small.png            (mail/icons/mail-toolbar-small.png)
+  skin/classic/messenger/icons/mail-toolbar.png                  (mail/icons/mail-toolbar.png)
+  skin/classic/messenger/icons/message-mail-attach-offl.png      (mail/icons/message-mail-attach-offl.png)
+  skin/classic/messenger/icons/message-mail-attach.png           (mail/icons/message-mail-attach.png)
+  skin/classic/messenger/icons/message-mail-imapdel-offl.png     (mail/icons/message-mail-imapdel-offl.png)
+  skin/classic/messenger/icons/message-mail-imapdelete.png       (mail/icons/message-mail-imapdelete.png)
+  skin/classic/messenger/icons/message-mail-new.png              (mail/icons/message-mail-new.png)
+  skin/classic/messenger/icons/message-mail-offl.png             (mail/icons/message-mail-offl.png)
+  skin/classic/messenger/icons/message-mail.png                  (mail/icons/message-mail.png)
+  skin/classic/messenger/icons/message-new-background.png        (mail/icons/message-new-background.png)
+  skin/classic/messenger/icons/message-news-attach-offl.png      (mail/icons/message-news-attach-offl.png)
+  skin/classic/messenger/icons/message-news-attach.png           (mail/icons/message-news-attach.png)
+  skin/classic/messenger/icons/message-news-new-attach-off.png   (mail/icons/message-news-new-attach-off.png)
+  skin/classic/messenger/icons/message-news-new-attach.png       (mail/icons/message-news-new-attach.png)
+  skin/classic/messenger/icons/message-news-new-offl.png         (mail/icons/message-news-new-offl.png)
+  skin/classic/messenger/icons/message-news-new.png              (mail/icons/message-news-new.png)
+  skin/classic/messenger/icons/message-news-offl.png             (mail/icons/message-news-offl.png)
+  skin/classic/messenger/icons/message-news.png                  (mail/icons/message-news.png)
+  skin/classic/messenger/icons/new-mail-alert.png                (mail/icons/new-mail-alert.png)
+  skin/classic/messenger/icons/readcol.png                       (mail/icons/readcol.png)
+  skin/classic/messenger/icons/readmail.png                      (mail/icons/readmail.png)
+  skin/classic/messenger/icons/saved-search-folder.png           (mail/icons/saved-search-folder.png)
+  skin/classic/messenger/icons/server-local-new.png              (mail/icons/server-local-new.png)
+  skin/classic/messenger/icons/server-local.png                  (mail/icons/server-local.png)
+  skin/classic/messenger/icons/server-mail-new.png               (mail/icons/server-mail-new.png)
+  skin/classic/messenger/icons/server-mail.png                   (mail/icons/server-mail.png)
+  skin/classic/messenger/icons/server-news-lock.png              (mail/icons/server-news-lock.png)
+  skin/classic/messenger/icons/server-news-new.png               (mail/icons/server-news-new.png)
+  skin/classic/messenger/icons/server-news.png                   (mail/icons/server-news.png)
+  skin/classic/messenger/icons/server-newsblog.png               (mail/icons/server-newsblog.png)
+  skin/classic/messenger/icons/server-remote-lock.png            (mail/icons/server-remote-lock.png)
+  skin/classic/messenger/icons/symbol-forwarded.png              (mail/icons/symbol-forwarded.png)
+  skin/classic/messenger/icons/symbol-forwarded-selected.png     (mail/icons/symbol-forwarded-selected.png)
+  skin/classic/messenger/icons/symbol-replied.png                (mail/icons/symbol-replied.png)
+  skin/classic/messenger/icons/symbol-replied-selected.png       (mail/icons/symbol-replied-selected.png)
+  skin/classic/messenger/icons/symbol-imapdeleted.png            (mail/icons/symbol-imapdeleted.png)
+  skin/classic/messenger/icons/symbol-imapdeleted-selected.png   (mail/icons/symbol-imapdeleted-selected.png)
+  skin/classic/messenger/icons/symbol-null.png                   (mail/icons/symbol-null.png)
+  skin/classic/messenger/icons/template-folder.png               (mail/icons/template-folder.png)
+  skin/classic/messenger/icons/thread-closed-eye-selected.png    (mail/icons/thread-closed-eye-selected.png)
+  skin/classic/messenger/icons/thread-closed-eye.png             (mail/icons/thread-closed-eye.png)
+  skin/classic/messenger/icons/thread-closed-kill.png            (mail/icons/thread-closed-kill.png)
+  skin/classic/messenger/icons/message-closed-kill.png           (mail/icons/message-closed-kill.png)
+  skin/classic/messenger/icons/thread-closed-offl-eye.png        (mail/icons/thread-closed-offl-eye.png)
+  skin/classic/messenger/icons/thread-closed-offl-kill.png       (mail/icons/thread-closed-offl-kill.png)
+  skin/classic/messenger/icons/thread-closed-selected.png        (mail/icons/thread-closed-selected.png)
+  skin/classic/messenger/icons/thread-closed.png                 (mail/icons/thread-closed.png)
+  skin/classic/messenger/icons/thread-new-closed-eye.png         (mail/icons/thread-new-closed-eye.png)
+  skin/classic/messenger/icons/thread-new-closed-kill.png        (mail/icons/thread-new-closed-kill.png)
+  skin/classic/messenger/icons/message-new-closed-kill.png       (mail/icons/message-new-closed-kill.png)
+  skin/classic/messenger/icons/thread-new-closed-offl-eye.png    (mail/icons/thread-new-closed-offl-eye.png)
+  skin/classic/messenger/icons/thread-new-closed-offl-kill.png   (mail/icons/thread-new-closed-offl-kill.png)
+  skin/classic/messenger/icons/thread-new-closed.png             (mail/icons/thread-new-closed.png)
+  skin/classic/messenger/icons/threadcol.png                     (mail/icons/threadcol.png)
+  skin/classic/messenger/icons/threadpane-splitter-bg.gif        (mail/icons/threadpane-splitter-bg.gif)
+  skin/classic/messenger/icons/unreadmail-selected.png           (mail/icons/unreadmail-selected.png)
+  skin/classic/messenger/icons/unreadmail.png                    (mail/icons/unreadmail.png)
+  skin/classic/messenger/icons/unthreadcol.png                   (mail/icons/unthreadcol.png)
+  skin/classic/messenger/icons/online.png                        (mail/icons/online.png)
+  skin/classic/messenger/icons/offline.png                       (mail/icons/offline.png)
+  skin/classic/messenger/icons/warning.png                       (mail/icons/warning.png)
+  skin/classic/messenger/icons/arrow-dn-7.png                    (mail/icons/arrow-dn-7.png)
+  skin/classic/messenger/icons/top-toolbar-background.gif        (mail/icons/top-toolbar-background.gif)
+  skin/classic/messenger/icons/alltabs-box-bkgnd.png                  (mail/icons/alltabs-box-bkgnd.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-bkgnd.png         (mail/icons/alltabs-box-overflow-bkgnd.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-bkgnd-animate.png (mail/icons/alltabs-box-overflow-bkgnd-animate.png)
+  skin/classic/messenger/icons/tab-arrow-start.png                    (mail/icons/tab-arrow-start.png)
+  skin/classic/messenger/icons/tab-arrow-start-bkgnd.png              (mail/icons/tab-arrow-start-bkgnd.png)
+  skin/classic/messenger/icons/tab-arrow-start-bkgnd-animate.png      (mail/icons/tab-arrow-start-bkgnd-animate.png)
+  skin/classic/messenger/icons/tab-arrow-end.png                      (mail/icons/tab-arrow-end.png)
+  skin/classic/messenger/icons/tab-arrow-end-bkgnd.png                (mail/icons/tab-arrow-end-bkgnd.png)
+  skin/classic/messenger/icons/tab-arrow-end-bkgnd-animate.png        (mail/icons/tab-arrow-end-bkgnd-animate.png)
+  skin/classic/messenger/icons/tabmail-tabs-bkgnd.png                 (mail/icons/tabmail-tabs-bkgnd.png)
+  skin/classic/messenger/icons/tabDragIndicator.png                   (mail/icons/tabDragIndicator.png)
+  skin/classic/messenger/icons/tab-left.png                           (mail/icons/tab-left.png)
+  skin/classic/messenger/icons/tab-left-bkgnd.png                     (mail/icons/tab-left-bkgnd.png)
+  skin/classic/messenger/icons/tab-left-hover.png                     (mail/icons/tab-left-hover.png)
+  skin/classic/messenger/icons/tab-middle.png                         (mail/icons/tab-middle.png)
+  skin/classic/messenger/icons/tab-middle-bkgnd.png                   (mail/icons/tab-middle-bkgnd.png)
+  skin/classic/messenger/icons/tab-middle-hover.png                   (mail/icons/tab-middle-hover.png)
+  skin/classic/messenger/icons/tab-right.png                          (mail/icons/tab-right.png)
+  skin/classic/messenger/icons/tab-right-bkgnd.png                    (mail/icons/tab-right-bkgnd.png)
+  skin/classic/messenger/icons/tab-right-hover.png                    (mail/icons/tab-right-hover.png)
+  skin/classic/messenger/icons/tabs-bottom-bg.png                     (mail/icons/tabs-bottom-bg.png)
+  skin/classic/messenger/tabs/alltabs-box-bkgnd-icon.png              (mail/tabs/alltabs-box-bkgnd-icon.png)
+  skin/classic/messenger/tabs/alltabs-box-bkgnd.png                   (mail/tabs/alltabs-box-bkgnd.png)
+  skin/classic/messenger/tabs/alltabs-box-overflow-bkgnd-animate.png  (mail/tabs/alltabs-box-overflow-bkgnd-animate.png)
+  skin/classic/messenger/tabs/alltabs-box-overflow-bkgnd.png          (mail/tabs/alltabs-box-overflow-bkgnd.png)
+  skin/classic/messenger/tabs/newtab.png                              (mail/tabs/newtab.png)
+  skin/classic/messenger/tabs/tab-arrow-end-bkgnd-animate.png         (mail/tabs/tab-arrow-end-bkgnd-animate.png)
+  skin/classic/messenger/tabs/tab-arrow-end-bkgnd.png                 (mail/tabs/tab-arrow-end-bkgnd.png)
+  skin/classic/messenger/tabs/tab-arrow-end.png                       (mail/tabs/tab-arrow-end.png)
+  skin/classic/messenger/tabs/tab-arrow-start-bkgnd-animate.png       (mail/tabs/tab-arrow-start-bkgnd-animate.png)
+  skin/classic/messenger/tabs/tab-arrow-start-bkgnd.png               (mail/tabs/tab-arrow-start-bkgnd.png)
+  skin/classic/messenger/tabs/tab-arrow-start.png                     (mail/tabs/tab-arrow-start.png)
+  skin/classic/messenger/tabs/tab-bkgnd.png                           (mail/tabs/tab-bkgnd.png)
+  skin/classic/messenger/tabs/tab-left-bkgnd.png                      (mail/tabs/tab-left-bkgnd.png)
+  skin/classic/messenger/tabs/tab-left-hover.png                      (mail/tabs/tab-left-hover.png)
+  skin/classic/messenger/tabs/tab-left-inactive.png                   (mail/tabs/tab-left-inactive.png)
+  skin/classic/messenger/tabs/tab-left.png                            (mail/tabs/tab-left.png)
+  skin/classic/messenger/tabs/tab-middle-bkgnd.png                    (mail/tabs/tab-middle-bkgnd.png)
+  skin/classic/messenger/tabs/tab-middle-hover.png                    (mail/tabs/tab-middle-hover.png)
+  skin/classic/messenger/tabs/tab-middle-inactive.png                 (mail/tabs/tab-middle-inactive.png)
+  skin/classic/messenger/tabs/tab-middle.png                          (mail/tabs/tab-middle.png)
+  skin/classic/messenger/tabs/tab-right-bkgnd.png                     (mail/tabs/tab-right-bkgnd.png)
+  skin/classic/messenger/tabs/tab-right-hover.png                     (mail/tabs/tab-right-hover.png)
+  skin/classic/messenger/tabs/tab-right-inactive.png                  (mail/tabs/tab-right-inactive.png)
+  skin/classic/messenger/tabs/tab-right.png                           (mail/tabs/tab-right.png)
+  skin/classic/messenger/tabs/tabDragIndicator.png                    (mail/tabs/tabDragIndicator.png)
+  skin/classic/messenger/tabs/tabbrowser-tabs-bkgnd.png               (mail/tabs/tabbrowser-tabs-bkgnd.png)
+  skin/classic/messenger/tabs/tabs-bottom-bg.png                      (mail/tabs/tabs-bottom-bg.png)
+  skin/classic/messenger/tabs/toolbar_background-inactive.png         (mail/tabs/toolbar_background-inactive.png)
+  skin/classic/messenger/tabs/toolbar_background.gif                  (mail/tabs/toolbar_background.gif)
+  skin/classic/messenger/accountcentral/accountsettings.png      (mail/accountcentral/accountsettings.png)
+  skin/classic/messenger/accountcentral/folder.png               (mail/accountcentral/folder.png)
+  skin/classic/messenger/accountcentral/getmail.png              (mail/accountcentral/getmail.png)
+  skin/classic/messenger/accountcentral/junk.png                 (mail/accountcentral/junk.png)
+  skin/classic/messenger/accountcentral/mailbox.png              (mail/accountcentral/mailbox.png)
+  skin/classic/messenger/accountcentral/newaccount.png           (mail/accountcentral/newaccount.png)
+  skin/classic/messenger/accountcentral/offline.png              (mail/accountcentral/offline.png)
+  skin/classic/messenger/accountcentral/offline.png              (mail/accountcentral/offline.png)
+  skin/classic/messenger/accountcentral/search-messages.png      (mail/accountcentral/search-messages.png)
+  skin/classic/messenger/accountcentral/manage-subscriptions.png (mail/accountcentral/manage-subscriptions.png)
+  skin/classic/messenger/accountcentral/manage-rss.png           (mail/accountcentral/manage-rss.png)
+  skin/classic/messenger/accountcentral/writemail.png            (mail/accountcentral/writemail.png)
 % skin communicator classic/1.0 %skin/classic/communicator/
-     skin/classic/communicator/communicator.css
-     skin/classic/communicator/smileys.css
-     skin/classic/communicator/icons/smileys/smiley-smile.png       (icons/smiley-smile.png)
-     skin/classic/communicator/icons/smileys/smiley-frown.png       (icons/smiley-frown.png)
-     skin/classic/communicator/icons/smileys/smiley-wink.png        (icons/smiley-wink.png)
-     skin/classic/communicator/icons/smileys/smiley-tongue-out.png  (icons/smiley-tongue-out.png)
-     skin/classic/communicator/icons/smileys/smiley-laughing.png    (icons/smiley-laughing.png)
-     skin/classic/communicator/icons/smileys/smiley-embarassed.png  (icons/smiley-embarassed.png)
-     skin/classic/communicator/icons/smileys/smiley-undecided.png   (icons/smiley-undecided.png)
-     skin/classic/communicator/icons/smileys/smiley-surprised.png   (icons/smiley-surprised.png)
-     skin/classic/communicator/icons/smileys/smiley-kiss.png        (icons/smiley-kiss.png)
-     skin/classic/communicator/icons/smileys/smiley-yell.png        (icons/smiley-yell.png)
-     skin/classic/communicator/icons/smileys/smiley-cool.png        (icons/smiley-cool.png)
-     skin/classic/communicator/icons/smileys/smiley-money-mouth.png (icons/smiley-money-mouth.png)
-     skin/classic/communicator/icons/smileys/smiley-foot-in-mouth.png (icons/smiley-foot-in-mouth.png)
-     skin/classic/communicator/icons/smileys/smiley-innocent.png    (icons/smiley-innocent.png)
-     skin/classic/communicator/icons/smileys/smiley-cry.png         (icons/smiley-cry.png)
-     skin/classic/communicator/icons/smileys/smiley-sealed.png      (icons/smiley-sealed.png)
-+    skin/classic/global/icons/find.png                             (icons/find.png)
-+    skin/classic/mozapps/extensions/viewButtons.png                (icons/viewButtons.png)
-     skin/classic/messenger/icons/arrow-dn-grey.png                 (icons/arrow-dn-grey.png)
-     skin/classic/messenger/icons/arrow-dn-black.png                (icons/arrow-dn-black.png)
-     skin/classic/messenger/icons/arrow-dn-blue.png                 (icons/arrow-dn-blue.png)
-     skin/classic/messenger/icons/arrow/arrow-left.png              (icons/arrow/arrow-left.png)
-     skin/classic/messenger/icons/arrow/arrow-right.png             (icons/arrow/arrow-right.png)
-     skin/classic/messenger/icons/arrow/arrow-up.png                (icons/arrow/arrow-up.png)
-     skin/classic/messenger/icons/arrow/arrow-down.png              (icons/arrow/arrow-down.png)
-     skin/classic/messenger/icons/arrow/arrow-left-dim.png          (icons/arrow/arrow-left-dim.png)
-     skin/classic/messenger/icons/arrow/arrow-right-dim.png         (icons/arrow/arrow-right-dim.png)
-     skin/classic/messenger/icons/arrow/arrow-up-dim.png            (icons/arrow/arrow-up-dim.png)
-     skin/classic/messenger/icons/arrow/arrow-down-dim.png          (icons/arrow/arrow-down-dim.png)
-     skin/classic/messenger/tagbg.png                               (tagbg.png)
-     preview.png
-     icon.png
+  skin/classic/communicator/communicator.css                     (mail/communicator.css)
+  skin/classic/communicator/smileys.css                          (mail/smileys.css)
+  skin/classic/communicator/icons/smileys/smiley-smile.png       (mail/icons/smiley-smile.png)
+  skin/classic/communicator/icons/smileys/smiley-frown.png       (mail/icons/smiley-frown.png)
+  skin/classic/communicator/icons/smileys/smiley-wink.png        (mail/icons/smiley-wink.png)
+  skin/classic/communicator/icons/smileys/smiley-tongue-out.png  (mail/icons/smiley-tongue-out.png)
+  skin/classic/communicator/icons/smileys/smiley-laughing.png    (mail/icons/smiley-laughing.png)
+  skin/classic/communicator/icons/smileys/smiley-embarassed.png  (mail/icons/smiley-embarassed.png)
+  skin/classic/communicator/icons/smileys/smiley-undecided.png   (mail/icons/smiley-undecided.png)
+  skin/classic/communicator/icons/smileys/smiley-surprised.png   (mail/icons/smiley-surprised.png)
+  skin/classic/communicator/icons/smileys/smiley-kiss.png        (mail/icons/smiley-kiss.png)
+  skin/classic/communicator/icons/smileys/smiley-yell.png        (mail/icons/smiley-yell.png)
+  skin/classic/communicator/icons/smileys/smiley-cool.png        (mail/icons/smiley-cool.png)
+  skin/classic/communicator/icons/smileys/smiley-money-mouth.png (mail/icons/smiley-money-mouth.png)
+  skin/classic/communicator/icons/smileys/smiley-foot-in-mouth.png (mail/icons/smiley-foot-in-mouth.png)
+  skin/classic/communicator/icons/smileys/smiley-innocent.png    (mail/icons/smiley-innocent.png)
+  skin/classic/communicator/icons/smileys/smiley-cry.png         (mail/icons/smiley-cry.png)
+  skin/classic/communicator/icons/smileys/smiley-sealed.png      (mail/icons/smiley-sealed.png)
++ skin/classic/global/icons/find.png                             (mail/icons/find.png)
++ skin/classic/mozapps/extensions/viewButtons.png                (mail/icons/viewButtons.png)
+  skin/classic/messenger/icons/arrow-dn-grey.png                 (mail/icons/arrow-dn-grey.png)
+  skin/classic/messenger/icons/arrow-dn-black.png                (mail/icons/arrow-dn-black.png)
+  skin/classic/messenger/icons/arrow-dn-blue.png                 (mail/icons/arrow-dn-blue.png)
+  skin/classic/messenger/icons/arrow/arrow-left.png              (mail/icons/arrow/arrow-left.png)
+  skin/classic/messenger/icons/arrow/arrow-right.png             (mail/icons/arrow/arrow-right.png)
+  skin/classic/messenger/icons/arrow/arrow-up.png                (mail/icons/arrow/arrow-up.png)
+  skin/classic/messenger/icons/arrow/arrow-down.png              (mail/icons/arrow/arrow-down.png)
+  skin/classic/messenger/icons/arrow/arrow-left-dim.png          (mail/icons/arrow/arrow-left-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-right-dim.png         (mail/icons/arrow/arrow-right-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-up-dim.png            (mail/icons/arrow/arrow-up-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-down-dim.png          (mail/icons/arrow/arrow-down-dim.png)
+  skin/classic/messenger/tagbg.png                               (mail/tagbg.png)
+  preview.png                                                    (mail/preview.png)
+  icon.png                                                       (mail/icon.png)
+% skin editor classic/1.0 %skin/classic/editor/
+  skin/classic/editor/editor.css                                 (editor/editor.css)
+  skin/classic/editor/EditorDialog.css                           (editor/EditorDialog.css)
+  skin/classic/editor/EdImageMapPage.css                         (editor/EdImageMapPage.css)
+  skin/classic/editor/EdImageMap.css                             (editor/EdImageMap.css)
+  skin/classic/editor/textEditor.css                             (editor/textEditor.css)
+  skin/classic/editor/icons/img-align-bottom.gif                 (editor/img-align-bottom.gif)
+  skin/classic/editor/icons/img-align-left.gif                   (editor/img-align-left.gif)
+  skin/classic/editor/icons/img-align-middle.gif                 (editor/img-align-middle.gif)
+  skin/classic/editor/icons/img-align-right.gif                  (editor/img-align-right.gif)
+  skin/classic/editor/icons/img-align-top.gif                    (editor/img-align-top.gif)
deleted file mode 100644
--- a/mail/themes/pinstripe/mail/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** 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 the Thunderbird Theme code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Scott MacGregor <mscott@mozilla.org>
-#
-# 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
-# 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
--- a/mail/themes/qute/Makefile.in
+++ b/mail/themes/qute/Makefile.in
@@ -37,11 +37,9 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = editor mail
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mail/themes/qute/editor/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** 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 the Thunderbird Theme code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Scott MacGregor <mscott@mozilla.org>
-#
-# 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
-# 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
deleted file mode 100644
--- a/mail/themes/qute/editor/jar.mn
+++ /dev/null
@@ -1,13 +0,0 @@
-classic.jar:
-% skin editor classic/1.0 %skin/classic/editor/
-  skin/classic/editor/editor.css
-  skin/classic/editor/EditorDialog.css
-  skin/classic/editor/EdImageMapPage.css
-  skin/classic/editor/EdImageMap.css
-  skin/classic/editor/textEditor.css
-  skin/classic/editor/icons/img-align-bottom.gif
-  skin/classic/editor/icons/img-align-left.gif
-  skin/classic/editor/icons/img-align-middle.gif
-  skin/classic/editor/icons/img-align-right.gif
-  skin/classic/editor/icons/img-align-top.gif
-
rename from mail/themes/qute/mail/jar.mn
rename to mail/themes/qute/jar.mn
--- a/mail/themes/qute/mail/jar.mn
+++ b/mail/themes/qute/jar.mn
@@ -1,185 +1,196 @@
 classic.jar:
-+   skin/classic/global/tree.css
-+   skin/classic/global/tree/sort-asc.gif (icons/sort-asc.gif)
-+   skin/classic/global/tree/sort-dsc.gif (icons/sort-dsc.gif)
-    skin/classic/communicator/smileys.css
++ skin/classic/global/tree.css                                (mail/tree.css)
++ skin/classic/global/tree/sort-asc.gif                       (mail/icons/sort-asc.gif)
++ skin/classic/global/tree/sort-dsc.gif                       (mail/icons/sort-dsc.gif)
+  skin/classic/communicator/smileys.css                       (mail/smileys.css)
 % skin messenger classic/1.0 %skin/classic/messenger/
-    skin/classic/messenger/primaryToolbar.css
-    skin/classic/messenger/accountCentral.css
-    skin/classic/messenger/accountManage.css
-    skin/classic/messenger/accountWizard.css
-    skin/classic/messenger/messageHeader.css
-    skin/classic/messenger/messageBody.css
-    skin/classic/messenger/messageQuotes.css
-*   skin/classic/messenger/messenger.css
-    skin/classic/messenger/mailWindow1.css
-    skin/classic/messenger/tagColors.css
-    skin/classic/messenger/messageWindow.css
-    skin/classic/messenger/searchBox.css
-    skin/classic/messenger/junkMail.css
-    skin/classic/messenger/folderMenus.css
-    skin/classic/messenger/folderPane.css
-    skin/classic/messenger/subscribe.css
-    skin/classic/messenger/virtualFolderListDialog.css
-    skin/classic/messenger/searchDialog.css
-    skin/classic/messenger/msgSelectOffline.css
-    skin/classic/messenger/filterDialog.css
-    skin/classic/messenger/dialogs.css
-    skin/classic/messenger/newmailalert.css
-    skin/classic/messenger/newMailAlertUnix.css
-*   skin/classic/messenger/tabmailBindings.xml
-    skin/classic/messenger/tabmail.css
-    skin/classic/messenger/editContactOverlay.css
-    skin/classic/messenger/starred48.png
-    skin/classic/messenger/contactStarred.png
-    skin/classic/messenger/starContact.png
-*   skin/classic/messenger/addressbook/addressbook.css          (addrbook/addressbook.css)
-    skin/classic/messenger/addressbook/abContactsPanel.css      (addrbook/abContactsPanel.css)
-    skin/classic/messenger/addressbook/cardDialog.css           (addrbook/cardDialog.css)
-    skin/classic/messenger/addressbook/abResultsPane.css        (addrbook/abResultsPane.css)
-    skin/classic/messenger/addressbook/icons/abcard.png         (addrbook/abcard.png)
-    skin/classic/messenger/addressbook/icons/addrbook.png       (addrbook/addrbook.png)
-    skin/classic/messenger/addressbook/icons/ablist.png         (addrbook/ablist.png)
-    skin/classic/messenger/addressbook/icons/addressbook-toolbar.png         (addrbook/addressbook-toolbar.png)
-    skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (addrbook/addressbook-toolbar-small.png)
-    skin/classic/messenger/addressbook/icons/abcard-large.png   (addrbook/abcard-large.png)
-    skin/classic/messenger/addressbook/icons/remote-addrbook.png (addrbook/remote-addrbook.png)
-    skin/classic/messenger/addressbook/icons/remote-addrbook-error.png      (addrbook/remote-addrbook-error.png)
-    skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png     (addrbook/secure-remote-addrbook.png)
-*   skin/classic/messenger/messengercompose/messengercompose.css (compose/messengercompose.css)
-*   skin/classic/messenger/messengercompose/editorOverlay.css    (compose/editorOverlay.css)
-    skin/classic/messenger/messengercompose/compose-toolbar.png  (compose/compose-toolbar.png)
-    skin/classic/messenger/messengercompose/compose-toolbar-small.png   (compose/compose-toolbar-small.png)
-    skin/classic/messenger/messengercompose/format-buttons.png  (compose/format-buttons.png)
+  skin/classic/messenger/primaryToolbar.css                   (mail/primaryToolbar.css)
+  skin/classic/messenger/accountCentral.css                   (mail/accountCentral.css)
+  skin/classic/messenger/accountManage.css                    (mail/accountManage.css)
+  skin/classic/messenger/accountWizard.css                    (mail/accountWizard.css)
+  skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
+  skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
+  skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
+* skin/classic/messenger/messenger.css                        (mail/messenger.css)
+  skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
+  skin/classic/messenger/tagColors.css                        (mail/tagColors.css)
+  skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
+  skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
+  skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
+  skin/classic/messenger/folderMenus.css                      (mail/folderMenus.css)
+  skin/classic/messenger/folderPane.css                       (mail/folderPane.css)
+  skin/classic/messenger/subscribe.css                        (mail/subscribe.css)
+  skin/classic/messenger/virtualFolderListDialog.css          (mail/virtualFolderListDialog.css)
+  skin/classic/messenger/searchDialog.css                     (mail/searchDialog.css)
+  skin/classic/messenger/msgSelectOffline.css                 (mail/msgSelectOffline.css)
+  skin/classic/messenger/filterDialog.css                     (mail/filterDialog.css)
+  skin/classic/messenger/dialogs.css                          (mail/dialogs.css)
+  skin/classic/messenger/newmailalert.css                     (mail/newmailalert.css)
+  skin/classic/messenger/newMailAlertUnix.css                 (mail/newMailAlertUnix.css)
+* skin/classic/messenger/tabmailBindings.xml                  (mail/tabmailBindings.xml)
+  skin/classic/messenger/tabmail.css                          (mail/tabmail.css)
+  skin/classic/messenger/editContactOverlay.css               (mail/editContactOverlay.css)
+  skin/classic/messenger/starred48.png                        (mail/starred48.png)
+  skin/classic/messenger/contactStarred.png                   (mail/contactStarred.png)
+  skin/classic/messenger/starContact.png                      (mail/starContact.png)
+* skin/classic/messenger/addressbook/addressbook.css          (mail/addrbook/addressbook.css)
+  skin/classic/messenger/addressbook/abContactsPanel.css      (mail/addrbook/abContactsPanel.css)
+  skin/classic/messenger/addressbook/cardDialog.css           (mail/addrbook/cardDialog.css)
+  skin/classic/messenger/addressbook/abResultsPane.css        (mail/addrbook/abResultsPane.css)
+  skin/classic/messenger/addressbook/icons/abcard.png         (mail/addrbook/abcard.png)
+  skin/classic/messenger/addressbook/icons/addrbook.png       (mail/addrbook/addrbook.png)
+  skin/classic/messenger/addressbook/icons/ablist.png         (mail/addrbook/ablist.png)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar.png         (mail/addrbook/addressbook-toolbar.png)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (mail/addrbook/addressbook-toolbar-small.png)
+  skin/classic/messenger/addressbook/icons/abcard-large.png   (mail/addrbook/abcard-large.png)
+  skin/classic/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook.png)
+  skin/classic/messenger/addressbook/icons/remote-addrbook-error.png      (mail/addrbook/remote-addrbook-error.png)
+  skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png     (mail/addrbook/secure-remote-addrbook.png)
+* skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
+* skin/classic/messenger/messengercompose/editorOverlay.css    (mail/compose/editorOverlay.css)
+  skin/classic/messenger/messengercompose/compose-toolbar.png  (mail/compose/compose-toolbar.png)
+  skin/classic/messenger/messengercompose/compose-toolbar-small.png   (mail/compose/compose-toolbar-small.png)
+  skin/classic/messenger/messengercompose/format-buttons.png  (mail/compose/format-buttons.png)
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
-    skin/classic/messenger-newsblog/feed-subscriptions.css      (newsblog/feed-subscriptions.css)
-    skin/classic/messenger-newsblog/icons/rss-feed.png          (newsblog/rss-feed.png)
-    skin/classic/messenger-newsblog/icons/server-rss.png        (newsblog/server-rss.png)
-*   skin/classic/messenger/preferences/preferences.css          (preferences/preferences.css)
-    skin/classic/messenger/preferences/general.png              (preferences/general.png)
-    skin/classic/messenger/preferences/display.png              (preferences/display.png)
-    skin/classic/messenger/preferences/composition.png          (preferences/composition.png)
-    skin/classic/messenger/preferences/privacy.png              (preferences/privacy.png)
-    skin/classic/messenger/preferences/attachments.png          (preferences/attachments.png)
-    skin/classic/messenger/preferences/advanced.png             (preferences/advanced.png)
-    skin/classic/messenger/preferences/background.png           (preferences/background.png)
-    skin/classic/messenger/preferences/hover.png                (preferences/hover.png)
-    skin/classic/messenger/preferences/selected.png             (preferences/selected.png)
-*   skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (smime/msgCompSMIMEOverlay.css)
-    skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (smime/msgHdrViewSMIMEOverlay.css)
-*   skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (smime/msgReadSMIMEOverlay.css)
-    skin/classic/messenger/smime/msgReadSecurityInfo.css        (smime/msgReadSecurityInfo.css)
-    skin/classic/messenger/smime/msgCompSecurityInfo.css        (smime/msgCompSecurityInfo.css)
-    skin/classic/messenger/smime/certFetchingStatus.css         (smime/certFetchingStatus.css)
-    skin/classic/messenger/smime/icons/hdrCryptoNotOk.png       (smime/hdrCryptoNotOk.png)
-    skin/classic/messenger/smime/icons/hdrCryptoOk.png          (smime/hdrCryptoOk.png)
-    skin/classic/messenger/smime/icons/hdrSignNotOk.png         (smime/hdrSignNotOk.png)
-    skin/classic/messenger/smime/icons/hdrSignOk.png            (smime/hdrSignOk.png)
-    skin/classic/messenger/smime/icons/hdrSignUnknown.png       (smime/hdrSignUnknown.png)
-    skin/classic/messenger/smime/icons/sbCryptoNotOk.png        (smime/sbCryptoNotOk.png)
-    skin/classic/messenger/smime/icons/sbCryptoOk.png           (smime/sbCryptoOk.png)
-    skin/classic/messenger/smime/icons/sbSignNotOk.png          (smime/sbSignNotOk.png)
-    skin/classic/messenger/smime/icons/sbSignOk.png             (smime/sbSignOk.png)
-    skin/classic/messenger/smime/icons/sbSignUnknown.png        (smime/sbSignUnknown.png)
-    skin/classic/messenger/icons/new-mail-alert.png             (icons/new-mail-alert.png)
-    skin/classic/messenger/icons/readmail.png                   (icons/readmail.png)
-    skin/classic/messenger/icons/mail-toolbar.png               (icons/mail-toolbar.png)
-    skin/classic/messenger/icons/mail-toolbar-small.png         (icons/mail-toolbar-small.png)
-    skin/classic/messenger/icons/folder.png                     (icons/folder.png)
-    skin/classic/messenger/icons/message.png                    (icons/message.png)
-    skin/classic/messenger/icons/attachment-deleted.png         (icons/attachment-deleted.png)
-    skin/classic/messenger/icons/attachment-col.png             (icons/attachment-col.png)
-    skin/classic/messenger/icons/attachment.png                 (icons/attachment.png)
-    skin/classic/messenger/icons/junk-col.png                   (icons/junk-col.png)
-    skin/classic/messenger/icons/thread-col.png                 (icons/thread-col.png)
-    skin/classic/messenger/icons/thread-col-sorta.png           (icons/thread-col-sorta.png)
-    skin/classic/messenger/icons/thread-col-sortd.png           (icons/thread-col-sortd.png)
-    skin/classic/messenger/icons/thread.png                     (icons/thread.png)
-    skin/classic/messenger/icons/thread-ignored.png             (icons/thread-ignored.png)
-    skin/classic/messenger/icons/message-ignored.png            (icons/message-ignored.png)
-    skin/classic/messenger/icons/thread-watched.png             (icons/thread-watched.png)
-    skin/classic/messenger/icons/flag-col.png                   (icons/flag-col.png)
-    skin/classic/messenger/icons/flag.png                       (icons/flag.png)
-    skin/classic/messenger/icons/server.png                     (icons/server.png)
-    skin/classic/messenger/icons/readcol.png                    (icons/readcol.png)
-    skin/classic/messenger/icons/unreadmail.png                 (icons/unreadmail.png)
-    skin/classic/messenger/icons/Search-bar.png                 (icons/Search-bar.png)
-    skin/classic/messenger/icons/search-arrow.gif               (icons/search-arrow.gif)
-    skin/classic/messenger/icons/quick-search-clear.png         (icons/quick-search-clear.png)
-    skin/classic/messenger/icons/close-button.png               (icons/close-button.png)
-    skin/classic/messenger/icons/remote-blocked.png             (icons/remote-blocked.png)
-    skin/classic/messenger/icons/phishing.png                   (icons/phishing.png)
-    skin/classic/messenger/icons/junk.png                       (icons/junk.png)
-    skin/classic/messenger/icons/check.gif                      (icons/check.gif)
-    skin/classic/messenger/icons/notchecked.gif                 (icons/notchecked.gif)
-    skin/classic/messenger/icons/online.png                     (icons/online.png)
-    skin/classic/messenger/icons/offline.png                    (icons/offline.png)
-    skin/classic/messenger/icons/row.png                        (icons/row.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-end-bkgnd.png           (icons/alltabs-box-overflow-end-bkgnd.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-end-bkgnd-animate.png   (icons/alltabs-box-overflow-end-bkgnd-animate.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-end-bkgnd-hover.png     (icons/alltabs-box-overflow-end-bkgnd-hover.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-start-bkgnd.png         (icons/alltabs-box-overflow-start-bkgnd.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-start-bkgnd-animate.png (icons/alltabs-box-overflow-start-bkgnd-animate.png)
-    skin/classic/messenger/icons/alltabs-box-overflow-start-bkgnd-hover.png   (icons/alltabs-box-overflow-start-bkgnd-hover.png)
-    skin/classic/messenger/icons/tab-arrow-end.png                  (icons/tab-arrow-end.png)
-    skin/classic/messenger/icons/tab-arrow-end-bkgnd-animate.png    (icons/tab-arrow-end-bkgnd-animate.png)
-    skin/classic/messenger/icons/tab-arrow-end-bkgnd-disabled.png   (icons/tab-arrow-end-bkgnd-disabled.png)
-    skin/classic/messenger/icons/tab-arrow-end-bkgnd-enabled.png    (icons/tab-arrow-end-bkgnd-enabled.png)
-    skin/classic/messenger/icons/tab-arrow-end-bkgnd-hover.png      (icons/tab-arrow-end-bkgnd-hover.png)
-    skin/classic/messenger/icons/tab-arrow-start.png                (icons/tab-arrow-start.png)
-    skin/classic/messenger/icons/tab-arrow-start-bkgnd-animate.png  (icons/tab-arrow-start-bkgnd-animate.png)
-    skin/classic/messenger/icons/tab-arrow-start-bkgnd-disabled.png (icons/tab-arrow-start-bkgnd-disabled.png)
-    skin/classic/messenger/icons/tab-arrow-start-bkgnd-enabled.png  (icons/tab-arrow-start-bkgnd-enabled.png)
-    skin/classic/messenger/icons/tab-arrow-start-bkgnd-hover.png    (icons/tab-arrow-start-bkgnd-hover.png)
-    skin/classic/messenger/icons/tabmail-tabs-bkgnd.png             (icons/tabmail-tabs-bkgnd.png)
-    skin/classic/messenger/icons/tabDragIndicator.png               (icons/tabDragIndicator.png)
-    skin/classic/messenger/icons/tab-left.png                       (icons/tab-left.png)
-    skin/classic/messenger/icons/tab-left-bkgnd.png                 (icons/tab-left-bkgnd.png)
-    skin/classic/messenger/icons/tab-middle.png                     (icons/tab-middle.png)
-    skin/classic/messenger/icons/tab-middle-bkgnd.png               (icons/tab-middle-bkgnd.png)
-    skin/classic/messenger/icons/tab-right.png                      (icons/tab-right.png)
-    skin/classic/messenger/icons/tab-right-bkgnd.png                (icons/tab-right-bkgnd.png)
-    skin/classic/messenger/icons/tabstrip-bottom.png                (icons/tabstrip-bottom.png)
+  skin/classic/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
+  skin/classic/messenger-newsblog/icons/rss-feed.png          (mail/newsblog/rss-feed.png)
+  skin/classic/messenger-newsblog/icons/server-rss.png        (mail/newsblog/server-rss.png)
+* skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
+  skin/classic/messenger/preferences/general.png              (mail/preferences/general.png)
+  skin/classic/messenger/preferences/display.png              (mail/preferences/display.png)
+  skin/classic/messenger/preferences/composition.png          (mail/preferences/composition.png)
+  skin/classic/messenger/preferences/privacy.png              (mail/preferences/privacy.png)
+  skin/classic/messenger/preferences/attachments.png          (mail/preferences/attachments.png)
+  skin/classic/messenger/preferences/advanced.png             (mail/preferences/advanced.png)
+  skin/classic/messenger/preferences/background.png           (mail/preferences/background.png)
+  skin/classic/messenger/preferences/hover.png                (mail/preferences/hover.png)
+  skin/classic/messenger/preferences/selected.png             (mail/preferences/selected.png)
+* skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (mail/smime/msgCompSMIMEOverlay.css)
+  skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (mail/smime/msgHdrViewSMIMEOverlay.css)
+* skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (mail/smime/msgReadSMIMEOverlay.css)
+  skin/classic/messenger/smime/msgReadSecurityInfo.css        (mail/smime/msgReadSecurityInfo.css)
+  skin/classic/messenger/smime/msgCompSecurityInfo.css        (mail/smime/msgCompSecurityInfo.css)
+  skin/classic/messenger/smime/certFetchingStatus.css         (mail/smime/certFetchingStatus.css)
+  skin/classic/messenger/smime/icons/hdrCryptoNotOk.png       (mail/smime/hdrCryptoNotOk.png)
+  skin/classic/messenger/smime/icons/hdrCryptoOk.png          (mail/smime/hdrCryptoOk.png)
+  skin/classic/messenger/smime/icons/hdrSignNotOk.png         (mail/smime/hdrSignNotOk.png)
+  skin/classic/messenger/smime/icons/hdrSignOk.png            (mail/smime/hdrSignOk.png)
+  skin/classic/messenger/smime/icons/hdrSignUnknown.png       (mail/smime/hdrSignUnknown.png)
+  skin/classic/messenger/smime/icons/sbCryptoNotOk.png        (mail/smime/sbCryptoNotOk.png)
+  skin/classic/messenger/smime/icons/sbCryptoOk.png           (mail/smime/sbCryptoOk.png)
+  skin/classic/messenger/smime/icons/sbSignNotOk.png          (mail/smime/sbSignNotOk.png)
+  skin/classic/messenger/smime/icons/sbSignOk.png             (mail/smime/sbSignOk.png)
+  skin/classic/messenger/smime/icons/sbSignUnknown.png        (mail/smime/sbSignUnknown.png)
+  skin/classic/messenger/icons/new-mail-alert.png             (mail/icons/new-mail-alert.png)
+  skin/classic/messenger/icons/readmail.png                   (mail/icons/readmail.png)
+  skin/classic/messenger/icons/mail-toolbar.png               (mail/icons/mail-toolbar.png)
+  skin/classic/messenger/icons/mail-toolbar-small.png         (mail/icons/mail-toolbar-small.png)
+  skin/classic/messenger/icons/folder.png                     (mail/icons/folder.png)
+  skin/classic/messenger/icons/message.png                    (mail/icons/message.png)
+  skin/classic/messenger/icons/attachment-deleted.png         (mail/icons/attachment-deleted.png)
+  skin/classic/messenger/icons/attachment-col.png             (mail/icons/attachment-col.png)
+  skin/classic/messenger/icons/attachment.png                 (mail/icons/attachment.png)
+  skin/classic/messenger/icons/junk-col.png                   (mail/icons/junk-col.png)
+  skin/classic/messenger/icons/thread-col.png                 (mail/icons/thread-col.png)
+  skin/classic/messenger/icons/thread-col-sorta.png           (mail/icons/thread-col-sorta.png)
+  skin/classic/messenger/icons/thread-col-sortd.png           (mail/icons/thread-col-sortd.png)
+  skin/classic/messenger/icons/thread.png                     (mail/icons/thread.png)
+  skin/classic/messenger/icons/thread-ignored.png             (mail/icons/thread-ignored.png)
+  skin/classic/messenger/icons/message-ignored.png            (mail/icons/message-ignored.png)
+  skin/classic/messenger/icons/thread-watched.png             (mail/icons/thread-watched.png)
+  skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
+  skin/classic/messenger/icons/flag.png                       (mail/icons/flag.png)
+  skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
+  skin/classic/messenger/icons/readcol.png                    (mail/icons/readcol.png)
+  skin/classic/messenger/icons/unreadmail.png                 (mail/icons/unreadmail.png)
+  skin/classic/messenger/icons/Search-bar.png                 (mail/icons/Search-bar.png)
+  skin/classic/messenger/icons/search-arrow.gif               (mail/icons/search-arrow.gif)
+  skin/classic/messenger/icons/quick-search-clear.png         (mail/icons/quick-search-clear.png)
+  skin/classic/messenger/icons/close-button.png               (mail/icons/close-button.png)
+  skin/classic/messenger/icons/remote-blocked.png             (mail/icons/remote-blocked.png)
+  skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
+  skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
+  skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
+  skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
+  skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
+  skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
+  skin/classic/messenger/icons/row.png                        (mail/icons/row.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-end-bkgnd.png           (mail/icons/alltabs-box-overflow-end-bkgnd.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-end-bkgnd-animate.png   (mail/icons/alltabs-box-overflow-end-bkgnd-animate.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-end-bkgnd-hover.png     (mail/icons/alltabs-box-overflow-end-bkgnd-hover.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-start-bkgnd.png         (mail/icons/alltabs-box-overflow-start-bkgnd.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-start-bkgnd-animate.png (mail/icons/alltabs-box-overflow-start-bkgnd-animate.png)
+  skin/classic/messenger/icons/alltabs-box-overflow-start-bkgnd-hover.png   (mail/icons/alltabs-box-overflow-start-bkgnd-hover.png)
+  skin/classic/messenger/icons/tab-arrow-end.png                  (mail/icons/tab-arrow-end.png)
+  skin/classic/messenger/icons/tab-arrow-end-bkgnd-animate.png    (mail/icons/tab-arrow-end-bkgnd-animate.png)
+  skin/classic/messenger/icons/tab-arrow-end-bkgnd-disabled.png   (mail/icons/tab-arrow-end-bkgnd-disabled.png)
+  skin/classic/messenger/icons/tab-arrow-end-bkgnd-enabled.png    (mail/icons/tab-arrow-end-bkgnd-enabled.png)
+  skin/classic/messenger/icons/tab-arrow-end-bkgnd-hover.png      (mail/icons/tab-arrow-end-bkgnd-hover.png)
+  skin/classic/messenger/icons/tab-arrow-start.png                (mail/icons/tab-arrow-start.png)
+  skin/classic/messenger/icons/tab-arrow-start-bkgnd-animate.png  (mail/icons/tab-arrow-start-bkgnd-animate.png)
+  skin/classic/messenger/icons/tab-arrow-start-bkgnd-disabled.png (mail/icons/tab-arrow-start-bkgnd-disabled.png)
+  skin/classic/messenger/icons/tab-arrow-start-bkgnd-enabled.png  (mail/icons/tab-arrow-start-bkgnd-enabled.png)
+  skin/classic/messenger/icons/tab-arrow-start-bkgnd-hover.png    (mail/icons/tab-arrow-start-bkgnd-hover.png)
+  skin/classic/messenger/icons/tabmail-tabs-bkgnd.png             (mail/icons/tabmail-tabs-bkgnd.png)
+  skin/classic/messenger/icons/tabDragIndicator.png               (mail/icons/tabDragIndicator.png)
+  skin/classic/messenger/icons/tab-left.png                       (mail/icons/tab-left.png)
+  skin/classic/messenger/icons/tab-left-bkgnd.png                 (mail/icons/tab-left-bkgnd.png)
+  skin/classic/messenger/icons/tab-middle.png                     (mail/icons/tab-middle.png)
+  skin/classic/messenger/icons/tab-middle-bkgnd.png               (mail/icons/tab-middle-bkgnd.png)
+  skin/classic/messenger/icons/tab-right.png                      (mail/icons/tab-right.png)
+  skin/classic/messenger/icons/tab-right-bkgnd.png                (mail/icons/tab-right-bkgnd.png)
+  skin/classic/messenger/icons/tabstrip-bottom.png                (mail/icons/tabstrip-bottom.png)
 % skin communicator classic/1.0 %skin/classic/communicator/
-    skin/classic/communicator/communicator.css
-    skin/classic/communicator/icons/smileys/smiley-smile.png    (icons/smiley-smile.png)
-    skin/classic/communicator/icons/smileys/smiley-frown.png    (icons/smiley-frown.png)
-    skin/classic/communicator/icons/smileys/smiley-wink.png     (icons/smiley-wink.png)
-    skin/classic/communicator/icons/smileys/smiley-tongue-out.png  (icons/smiley-tongue-out.png)
-    skin/classic/communicator/icons/smileys/smiley-laughing.png (icons/smiley-laughing.png)
-    skin/classic/communicator/icons/smileys/smiley-embarassed.png  (icons/smiley-embarassed.png)
-    skin/classic/communicator/icons/smileys/smiley-undecided.png   (icons/smiley-undecided.png)
-    skin/classic/communicator/icons/smileys/smiley-surprised.png   (icons/smiley-surprised.png)
-    skin/classic/communicator/icons/smileys/smiley-kiss.png     (icons/smiley-kiss.png)
-    skin/classic/communicator/icons/smileys/smiley-yell.png     (icons/smiley-yell.png)
-    skin/classic/communicator/icons/smileys/smiley-cool.png     (icons/smiley-cool.png)
-    skin/classic/communicator/icons/smileys/smiley-money-mouth.png (icons/smiley-money-mouth.png)
-    skin/classic/communicator/icons/smileys/smiley-foot-in-mouth.png (icons/smiley-foot-in-mouth.png)
-    skin/classic/communicator/icons/smileys/smiley-innocent.png (icons/smiley-innocent.png)
-    skin/classic/communicator/icons/smileys/smiley-cry.png      (icons/smiley-cry.png)
-    skin/classic/communicator/icons/smileys/smiley-sealed.png   (icons/smiley-sealed.png)
-    skin/classic/messenger/accountcentral/read-messages.png     (accountcentral/read-messages.png)
-    skin/classic/messenger/accountcentral/write-message.png     (accountcentral/write-message.png)
-    skin/classic/messenger/accountcentral/create-account.png    (accountcentral/create-account.png)
-    skin/classic/messenger/accountcentral/account-settings.png  (accountcentral/account-settings.png)
-    skin/classic/messenger/accountcentral/search-messages.png   (accountcentral/search-messages.png)
-    skin/classic/messenger/accountcentral/manage-filters.png    (accountcentral/manage-filters.png)
-    skin/classic/messenger/accountcentral/offline-settings.png  (accountcentral/offline-settings.png)
-    skin/classic/messenger/accountcentral/manage-imap.png       (accountcentral/manage-imap.png)
-    skin/classic/messenger/accountcentral/manage-newsgroups.png (accountcentral/manage-newsgroups.png)
-    skin/classic/messenger/accountcentral/manage-rss.png        (accountcentral/manage-rss.png)
-    skin/classic/messenger/icons/arrow-dn-grey.png              (icons/arrow-dn-grey.png)
-    skin/classic/messenger/icons/arrow-dn-black.png             (icons/arrow-dn-black.png)
-    skin/classic/messenger/icons/arrow-dn-blue.png              (icons/arrow-dn-blue.png)
-    skin/classic/messenger/icons/arrow/arrow-left.png           (icons/arrow/arrow-left.png)
-    skin/classic/messenger/icons/arrow/arrow-right.png          (icons/arrow/arrow-right.png)
-    skin/classic/messenger/icons/arrow/arrow-up.png             (icons/arrow/arrow-up.png)
-    skin/classic/messenger/icons/arrow/arrow-down.png           (icons/arrow/arrow-down.png)
-    skin/classic/messenger/icons/arrow/arrow-left-dim.png       (icons/arrow/arrow-left-dim.png)
-    skin/classic/messenger/icons/arrow/arrow-right-dim.png      (icons/arrow/arrow-right-dim.png)
-    skin/classic/messenger/icons/arrow/arrow-up-dim.png         (icons/arrow/arrow-up-dim.png)
-    skin/classic/messenger/icons/arrow/arrow-down-dim.png       (icons/arrow/arrow-down-dim.png)
-    skin/classic/messenger/icons/chevron.png                    (icons/chevron.png)
-    skin/classic/messenger/tagbg.png                            (tagbg.png)
-    icon.png
-    preview.png
+  skin/classic/communicator/communicator.css                      (mail/communicator.css)
+  skin/classic/communicator/icons/smileys/smiley-smile.png        (mail/icons/smiley-smile.png)
+  skin/classic/communicator/icons/smileys/smiley-frown.png        (mail/icons/smiley-frown.png)
+  skin/classic/communicator/icons/smileys/smiley-wink.png         (mail/icons/smiley-wink.png)
+  skin/classic/communicator/icons/smileys/smiley-tongue-out.png  (mail/icons/smiley-tongue-out.png)
+  skin/classic/communicator/icons/smileys/smiley-laughing.png (mail/icons/smiley-laughing.png)
+  skin/classic/communicator/icons/smileys/smiley-embarassed.png  (mail/icons/smiley-embarassed.png)
+  skin/classic/communicator/icons/smileys/smiley-undecided.png   (mail/icons/smiley-undecided.png)
+  skin/classic/communicator/icons/smileys/smiley-surprised.png   (mail/icons/smiley-surprised.png)
+  skin/classic/communicator/icons/smileys/smiley-kiss.png     (mail/icons/smiley-kiss.png)
+  skin/classic/communicator/icons/smileys/smiley-yell.png     (mail/icons/smiley-yell.png)
+  skin/classic/communicator/icons/smileys/smiley-cool.png     (mail/icons/smiley-cool.png)
+  skin/classic/communicator/icons/smileys/smiley-money-mouth.png (mail/icons/smiley-money-mouth.png)
+  skin/classic/communicator/icons/smileys/smiley-foot-in-mouth.png (mail/icons/smiley-foot-in-mouth.png)
+  skin/classic/communicator/icons/smileys/smiley-innocent.png (mail/icons/smiley-innocent.png)
+  skin/classic/communicator/icons/smileys/smiley-cry.png      (mail/icons/smiley-cry.png)
+  skin/classic/communicator/icons/smileys/smiley-sealed.png   (mail/icons/smiley-sealed.png)
+  skin/classic/messenger/accountcentral/read-messages.png     (mail/accountcentral/read-messages.png)
+  skin/classic/messenger/accountcentral/write-message.png     (mail/accountcentral/write-message.png)
+  skin/classic/messenger/accountcentral/create-account.png    (mail/accountcentral/create-account.png)
+  skin/classic/messenger/accountcentral/account-settings.png  (mail/accountcentral/account-settings.png)
+  skin/classic/messenger/accountcentral/search-messages.png   (mail/accountcentral/search-messages.png)
+  skin/classic/messenger/accountcentral/manage-filters.png    (mail/accountcentral/manage-filters.png)
+  skin/classic/messenger/accountcentral/offline-settings.png  (mail/accountcentral/offline-settings.png)
+  skin/classic/messenger/accountcentral/manage-imap.png       (mail/accountcentral/manage-imap.png)
+  skin/classic/messenger/accountcentral/manage-newsgroups.png (mail/accountcentral/manage-newsgroups.png)
+  skin/classic/messenger/accountcentral/manage-rss.png        (mail/accountcentral/manage-rss.png)
+  skin/classic/messenger/icons/arrow-dn-grey.png              (mail/icons/arrow-dn-grey.png)
+  skin/classic/messenger/icons/arrow-dn-black.png             (mail/icons/arrow-dn-black.png)
+  skin/classic/messenger/icons/arrow-dn-blue.png              (mail/icons/arrow-dn-blue.png)
+  skin/classic/messenger/icons/arrow/arrow-left.png           (mail/icons/arrow/arrow-left.png)
+  skin/classic/messenger/icons/arrow/arrow-right.png          (mail/icons/arrow/arrow-right.png)
+  skin/classic/messenger/icons/arrow/arrow-up.png             (mail/icons/arrow/arrow-up.png)
+  skin/classic/messenger/icons/arrow/arrow-down.png           (mail/icons/arrow/arrow-down.png)
+  skin/classic/messenger/icons/arrow/arrow-left-dim.png       (mail/icons/arrow/arrow-left-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-right-dim.png      (mail/icons/arrow/arrow-right-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-up-dim.png         (mail/icons/arrow/arrow-up-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-down-dim.png       (mail/icons/arrow/arrow-down-dim.png)
+  skin/classic/messenger/icons/chevron.png                    (mail/icons/chevron.png)
+  skin/classic/messenger/tagbg.png                            (mail/tagbg.png)
+  icon.png                                                    (mail/icon.png)
+  preview.png                                                 (mail/preview.png)
+% skin editor classic/1.0 %skin/classic/editor/
+  skin/classic/editor/editor.css                              (editor/editor.css)
+  skin/classic/editor/EditorDialog.css                        (editor/EditorDialog.css)
+  skin/classic/editor/EdImageMapPage.css                      (editor/EdImageMapPage.css)
+  skin/classic/editor/EdImageMap.css                          (editor/EdImageMap.css)
+  skin/classic/editor/textEditor.css                          (editor/textEditor.css)
+  skin/classic/editor/icons/img-align-bottom.gif              (editor/img-align-bottom.gif)
+  skin/classic/editor/icons/img-align-left.gif                (editor/img-align-left.gif)
+  skin/classic/editor/icons/img-align-middle.gif              (editor/img-align-middle.gif)
+  skin/classic/editor/icons/img-align-right.gif               (editor/img-align-right.gif)
+  skin/classic/editor/icons/img-align-top.gif                 (editor/img-align-top.gif)
deleted file mode 100644
--- a/mail/themes/qute/mail/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** 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 the Thunderbird Theme code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Scott MacGregor <mscott@mozilla.org>
-#
-# 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
-# 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