Revert "no message"

This reverts commit 5b6a3c9bc9e59f2c9ba539dad5027425c73f29fd.

93 files changed, 247 insertions, 50 deletions

diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js
index 22d2e8ffb..d0c12be24 100644
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -12,7 +12,7 @@
 #endif
 
 pref("general.useragent.locale", "@AB_CD@");
-pref("general.skins.selectedSkin", "ClassicTB2");
+pref("general.skins.selectedSkin", "classic/1.0");
 
 #ifdef XP_MACOSX
 pref("browser.chromeURL", "chrome://messenger/content/messengercompose/messengercompose.xul");
@@ -22,7 +22,12 @@ pref("mail.biff.animate_dock_icon", false);
 pref("mail.rights.version", 0);
 
 // Don't show the about:rights notification in debug or non-official builds.
+#ifdef DEBUG
 pref("mail.rights.override", true);
+#endif
+#ifndef MOZILLA_OFFICIAL
+pref("mail.rights.override", true);
+#endif
 
 // gtk2 (*nix) lacks transparent/translucent drag support (bug 376238), so we
 // want to disable it so people can see where they are dragging things.
@@ -111,7 +116,7 @@ pref("app.update.idletime", 60);
 
 // Whether or not to attempt using the service for updates.
 #ifdef MOZ_MAINTENANCE_SERVICE
-pref("app.update.service.enabled", false);
+pref("app.update.service.enabled", true);
 #endif
 
 // Release notes URL
@@ -474,7 +479,11 @@ pref("mail.tabs.closeWindowWithLastTab", true);
 pref("mail.tabs.closeButtons", 1);
 
 // Allow the tabs to be in the titlebar on supported systems
+#ifdef UNIX_BUT_NOT_MAC
 pref("mail.tabs.drawInTitlebar", false);
+#else
+pref("mail.tabs.drawInTitlebar", true);
+#endif
 
 // The breakpad report server to link to in about:crashes
 pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
diff --git a/mail/base/moz.build b/mail/base/moz.build
index 46e426b01..c16455fbe 100644
--- a/mail/base/moz.build
+++ b/mail/base/moz.build
@@ -20,5 +20,8 @@ if CONFIG['MOZILLA_OFFICIAL']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
     DEFINES['HAVE_SHELL_SERVICE'] = 1
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
+    DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
+
 if CONFIG['MOZ_UPDATER']:
     DEFINES['MOZ_UPDATER'] = 1
diff --git a/mail/branding/unofficial/Makefile.in b/mail/branding/aurora/Makefile.in
index b64845602..b64845602 100644
--- a/mail/branding/unofficial/Makefile.in
+++ b/mail/branding/aurora/Makefile.in
diff --git a/mail/branding/unofficial/VisualElements_150.png b/mail/branding/aurora/VisualElements_150.png
index 197d223a4..197d223a4 100644
--- a/mail/branding/unofficial/VisualElements_150.png
+++ b/mail/branding/aurora/VisualElements_150.png
diff --git a/mail/branding/unofficial/VisualElements_70.png b/mail/branding/aurora/VisualElements_70.png
index c76ce9d3c..c76ce9d3c 100644
--- a/mail/branding/unofficial/VisualElements_70.png
+++ b/mail/branding/aurora/VisualElements_70.png
diff --git a/mail/branding/aurora/background.png b/mail/branding/aurora/background.png
new file mode 100644
index 000000000..0c9aab82a
--- /dev/null
+++ b/mail/branding/aurora/background.png
diff --git a/mail/branding/unofficial/branding.nsi b/mail/branding/aurora/branding.nsi
index 9313d8363..9313d8363 100644
--- a/mail/branding/unofficial/branding.nsi
+++ b/mail/branding/aurora/branding.nsi
diff --git a/mail/branding/unofficial/configure.sh b/mail/branding/aurora/configure.sh
index f610975cf..f610975cf 100644
--- a/mail/branding/unofficial/configure.sh
+++ b/mail/branding/aurora/configure.sh
diff --git a/mail/branding/unofficial/content/about-background.png b/mail/branding/aurora/content/about-background.png
index 2d22a1086..2d22a1086 100644
--- a/mail/branding/unofficial/content/about-background.png
+++ b/mail/branding/aurora/content/about-background.png
diff --git a/mail/branding/aurora/content/about-logo.png b/mail/branding/aurora/content/about-logo.png
new file mode 100644
index 000000000..f8bd88844
--- /dev/null
+++ b/mail/branding/aurora/content/about-logo.png
diff --git a/mail/branding/aurora/content/about-wordmark.png b/mail/branding/aurora/content/about-wordmark.png
new file mode 100644
index 000000000..b945db9e7
--- /dev/null
+++ b/mail/branding/aurora/content/about-wordmark.png
diff --git a/mail/branding/aurora/content/about.png b/mail/branding/aurora/content/about.png
new file mode 100644
index 000000000..c9e680009
--- /dev/null
+++ b/mail/branding/aurora/content/about.png
diff --git a/mail/branding/aurora/content/aboutDialog.css b/mail/branding/aurora/content/aboutDialog.css
new file mode 100644
index 000000000..c417cbd61
--- /dev/null
+++ b/mail/branding/aurora/content/aboutDialog.css
@@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#aboutDialogContainer {
+  background-image: url("chrome://branding/content/about-background.png");
+  background-repeat: no-repeat;
+  background-color: #3465a4;
+  color: #fff;
+}
+
+.text-link {
+  color: #113 !important;
+}
+
+.bottom-link {
+  color: #fff !important;
+}
+
+#rightBox {
+  /* this margin prevents text from overlapping the egg image */
+  margin-left: 280px;
+  margin-right: 20px;
+}
+
+#bottomBox {
+  background-color: #2a3569;
+}
diff --git a/mail/branding/aurora/content/icon48.png b/mail/branding/aurora/content/icon48.png
new file mode 100644
index 000000000..fd1b5f8c3
--- /dev/null
+++ b/mail/branding/aurora/content/icon48.png
diff --git a/mail/branding/aurora/content/icon64.png b/mail/branding/aurora/content/icon64.png
new file mode 100644
index 000000000..0d73eb068
--- /dev/null
+++ b/mail/branding/aurora/content/icon64.png
diff --git a/mail/branding/aurora/disk.icns b/mail/branding/aurora/disk.icns
new file mode 100644
index 000000000..85e8397a2
--- /dev/null
+++ b/mail/branding/aurora/disk.icns
diff --git a/mail/branding/unofficial/dsstore b/mail/branding/aurora/dsstore
index ad6e1ef5b..ad6e1ef5b 100644
--- a/mail/branding/unofficial/dsstore
+++ b/mail/branding/aurora/dsstore
diff --git a/mail/branding/unofficial/jar.mn b/mail/branding/aurora/jar.mn
index 40337de09..40337de09 100644
--- a/mail/branding/unofficial/jar.mn
+++ b/mail/branding/aurora/jar.mn
diff --git a/mail/branding/unofficial/locales/en-US/brand.dtd b/mail/branding/aurora/locales/en-US/brand.dtd
index 999f5c8e4..b68127b92 100644
--- a/mail/branding/unofficial/locales/en-US/brand.dtd
+++ b/mail/branding/aurora/locales/en-US/brand.dtd
@@ -2,9 +2,8 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "MailNews">
-<!ENTITY  brandFullName         "MailNews">
-<!ENTITY  vendorShortName       "BinOC">
-<!ENTITY  vendorFullName        "Binary Outcast">
-<!ENTITY  vendorURL             "http://binaryoutcast.com/">
+<!ENTITY  brandShortName        "Earlybird">
+<!ENTITY  brandShorterName      "Earlybird">
+<!ENTITY  brandFullName         "Earlybird">
+<!ENTITY  vendorShortName       "mozilla.org">
 <!ENTITY  trademarkInfo.part1   " ">
diff --git a/mail/branding/aurora/locales/en-US/brand.properties b/mail/branding/aurora/locales/en-US/brand.properties
new file mode 100644
index 000000000..876673b52
--- /dev/null
+++ b/mail/branding/aurora/locales/en-US/brand.properties
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Earlybird
+brandShorterName=Earlybird
+brandFullName=Earlybird
+vendorShortName=mozilla.org
diff --git a/mail/branding/unofficial/locales/jar.mn b/mail/branding/aurora/locales/jar.mn
index 0e4af099f..0e4af099f 100644
--- a/mail/branding/unofficial/locales/jar.mn
+++ b/mail/branding/aurora/locales/jar.mn
diff --git a/mail/branding/unofficial/locales/moz.build b/mail/branding/aurora/locales/moz.build
index e59008d87..e59008d87 100644
--- a/mail/branding/unofficial/locales/moz.build
+++ b/mail/branding/aurora/locales/moz.build
diff --git a/mail/branding/aurora/mailicon16.png b/mail/branding/aurora/mailicon16.png
new file mode 100644
index 000000000..3fc609009
--- /dev/null
+++ b/mail/branding/aurora/mailicon16.png
diff --git a/mail/branding/aurora/mailicon22.png b/mail/branding/aurora/mailicon22.png
new file mode 100644
index 000000000..c7c7a1bd7
--- /dev/null
+++ b/mail/branding/aurora/mailicon22.png
diff --git a/mail/branding/aurora/mailicon24.png b/mail/branding/aurora/mailicon24.png
new file mode 100644
index 000000000..a97d0828f
--- /dev/null
+++ b/mail/branding/aurora/mailicon24.png
diff --git a/mail/branding/aurora/mailicon256.png b/mail/branding/aurora/mailicon256.png
new file mode 100644
index 000000000..e94e5cc0c
--- /dev/null
+++ b/mail/branding/aurora/mailicon256.png
diff --git a/mail/branding/aurora/mailicon32.png b/mail/branding/aurora/mailicon32.png
new file mode 100644
index 000000000..bf2db55ed
--- /dev/null
+++ b/mail/branding/aurora/mailicon32.png
diff --git a/mail/branding/aurora/mailicon48.png b/mail/branding/aurora/mailicon48.png
new file mode 100644
index 000000000..fd1b5f8c3
--- /dev/null
+++ b/mail/branding/aurora/mailicon48.png
diff --git a/mail/branding/unofficial/moz.build b/mail/branding/aurora/moz.build
index b032e9d82..b032e9d82 100644
--- a/mail/branding/unofficial/moz.build
+++ b/mail/branding/aurora/moz.build
diff --git a/mail/branding/unofficial/thunderbird-branding.js b/mail/branding/aurora/thunderbird-branding.js
index 9ab8773c4..9ab8773c4 100644
--- a/mail/branding/unofficial/thunderbird-branding.js
+++ b/mail/branding/aurora/thunderbird-branding.js
diff --git a/mail/branding/unofficial/thunderbird.VisualElementsManifest.xml b/mail/branding/aurora/thunderbird.VisualElementsManifest.xml
index d581a602f..d581a602f 100644
--- a/mail/branding/unofficial/thunderbird.VisualElementsManifest.xml
+++ b/mail/branding/aurora/thunderbird.VisualElementsManifest.xml
diff --git a/mail/branding/aurora/thunderbird.icns b/mail/branding/aurora/thunderbird.icns
new file mode 100644
index 000000000..9219648c2
--- /dev/null
+++ b/mail/branding/aurora/thunderbird.icns
diff --git a/mail/branding/aurora/thunderbird.ico b/mail/branding/aurora/thunderbird.ico
new file mode 100644
index 000000000..aa1a33415
--- /dev/null
+++ b/mail/branding/aurora/thunderbird.ico
diff --git a/mail/branding/aurora/windows/messengerWindow.ico b/mail/branding/aurora/windows/messengerWindow.ico
new file mode 100644
index 000000000..6c3555877
--- /dev/null
+++ b/mail/branding/aurora/windows/messengerWindow.ico
diff --git a/mail/branding/aurora/wizHeader.bmp b/mail/branding/aurora/wizHeader.bmp
new file mode 100644
index 000000000..297277ad3
--- /dev/null
+++ b/mail/branding/aurora/wizHeader.bmp
diff --git a/mail/branding/aurora/wizHeaderRTL.bmp b/mail/branding/aurora/wizHeaderRTL.bmp
new file mode 100644
index 000000000..087c3b422
--- /dev/null
+++ b/mail/branding/aurora/wizHeaderRTL.bmp
diff --git a/mail/branding/aurora/wizWatermark.bmp b/mail/branding/aurora/wizWatermark.bmp
new file mode 100644
index 000000000..e1e881409
--- /dev/null
+++ b/mail/branding/aurora/wizWatermark.bmp
diff --git a/mail/branding/nightly/Makefile.in b/mail/branding/nightly/Makefile.in
new file mode 100644
index 000000000..b64845602
--- /dev/null
+++ b/mail/branding/nightly/Makefile.in
@@ -0,0 +1,36 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Branding Makefile for nightlies/unofficial branding
+
+include $(topsrcdir)/config/rules.mk
+
+export::
+	$(NSINSTALL) -D $(DIST)/branding
+ifeq ($(OS_ARCH),WINNT)
+	cp $(srcdir)/thunderbird.ico   $(DIST)/branding/thunderbird.ico
+	cp $(srcdir)/branding.nsi      $(DIST)/branding/branding.nsi
+	cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
+	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
+	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
+endif
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+	cp $(srcdir)/background.png    $(DIST)/branding/background.png
+	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore
+	cp $(srcdir)/disk.icns         $(DIST)/branding/disk.icns
+	cp $(srcdir)/thunderbird.icns  $(DIST)/branding/thunderbird.icns
+endif
+ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
+	cp $(srcdir)/mailicon16.png  $(DIST)/branding/default16.png
+	cp $(srcdir)/mailicon22.png  $(DIST)/branding/default22.png
+	cp $(srcdir)/mailicon24.png  $(DIST)/branding/default24.png
+	cp $(srcdir)/mailicon32.png  $(DIST)/branding/default32.png
+	cp $(srcdir)/mailicon48.png  $(DIST)/branding/default48.png
+	cp $(srcdir)/mailicon256.png $(DIST)/branding/default256.png
+endif
+
+# Now sort out the branding specific icons
+ifeq ($(OS_ARCH),WINNT)
+	cp $(srcdir)/windows/messengerWindow.ico  $(DIST)/branding/messengerWindow.ico
+endif
diff --git a/mail/branding/nightly/VisualElements_150.png b/mail/branding/nightly/VisualElements_150.png
new file mode 100644
index 000000000..555c0875d
--- /dev/null
+++ b/mail/branding/nightly/VisualElements_150.png
diff --git a/mail/branding/nightly/VisualElements_70.png b/mail/branding/nightly/VisualElements_70.png
new file mode 100644
index 000000000..c4b2ff759
--- /dev/null
+++ b/mail/branding/nightly/VisualElements_70.png
diff --git a/mail/branding/nightly/background.png b/mail/branding/nightly/background.png
new file mode 100644
index 000000000..0c9aab82a
--- /dev/null
+++ b/mail/branding/nightly/background.png
diff --git a/mail/branding/nightly/branding.nsi b/mail/branding/nightly/branding.nsi
new file mode 100644
index 000000000..f30bb23b1
--- /dev/null
+++ b/mail/branding/nightly/branding.nsi
@@ -0,0 +1,15 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# NSIS defines for nightly builds.
+# The release build branding.nsi is located in other-license/branding/thunderbird/
+
+# BrandFullNameInternal is used for some registry and file system values
+# instead of BrandFullName and typically should not be modified.
+!define BrandFullNameInternal "Daily"
+!define CompanyName           "mozilla.org"
+!define URLInfoAbout          "http://www.mozilla.org/"
+!define URLUpdateInfo         "http://www.mozilla.org/products/thunderbird/"
+!define URLSystemRequirements "https://www.mozilla.org/thunderbird/system-requirements/"
+!define SurveyURL             "http://live.mozillamessaging.com/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
diff --git a/mail/branding/unofficial/locales/en-US/brand.properties b/mail/branding/nightly/configure.sh
index a73377c48..3f6ef55ed 100644
--- a/mail/branding/unofficial/locales/en-US/brand.properties
+++ b/mail/branding/nightly/configure.sh
@@ -2,7 +2,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=MailNews
-brandFullName=MailNews
-vendorShortName=BinOC
-
+MOZ_APP_DISPLAYNAME=Daily
diff --git a/mail/branding/nightly/content/about-background.png b/mail/branding/nightly/content/about-background.png
new file mode 100644
index 000000000..d7c4b4bdb
--- /dev/null
+++ b/mail/branding/nightly/content/about-background.png
diff --git a/mail/branding/nightly/content/about-logo.png b/mail/branding/nightly/content/about-logo.png
new file mode 100644
index 000000000..dc4a20a30
--- /dev/null
+++ b/mail/branding/nightly/content/about-logo.png
diff --git a/mail/branding/nightly/content/about-wordmark.png b/mail/branding/nightly/content/about-wordmark.png
new file mode 100644
index 000000000..15523d76c
--- /dev/null
+++ b/mail/branding/nightly/content/about-wordmark.png
diff --git a/mail/branding/nightly/content/about.png b/mail/branding/nightly/content/about.png
new file mode 100644
index 000000000..38191f66e
--- /dev/null
+++ b/mail/branding/nightly/content/about.png
diff --git a/mail/branding/nightly/content/aboutDialog.css b/mail/branding/nightly/content/aboutDialog.css
new file mode 100644
index 000000000..25a02f43e
--- /dev/null
+++ b/mail/branding/nightly/content/aboutDialog.css
@@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#aboutDialogContainer {
+  background-image: url("chrome://branding/content/about-background.png");
+  background-repeat: no-repeat;
+  background-color: #ce5c00;
+  color: #fff;
+}
+
+.text-link {
+  color: #33f !important;
+}
+
+.bottom-link {
+  color: #fff !important;
+}
+
+#rightBox {
+  /* this margin prevents text from overlapping the egg image */
+  margin-left: 280px;
+  margin-right: 20px;
+}
+
+#bottomBox {
+  background-color: rgba(0,0,0,.7);
+}
diff --git a/mail/branding/nightly/content/icon48.png b/mail/branding/nightly/content/icon48.png
new file mode 100644
index 000000000..626deab27
--- /dev/null
+++ b/mail/branding/nightly/content/icon48.png
diff --git a/mail/branding/nightly/content/icon64.png b/mail/branding/nightly/content/icon64.png
new file mode 100644
index 000000000..cf68307f8
--- /dev/null
+++ b/mail/branding/nightly/content/icon64.png
diff --git a/mail/branding/nightly/disk.icns b/mail/branding/nightly/disk.icns
new file mode 100644
index 000000000..b42ab1d3e
--- /dev/null
+++ b/mail/branding/nightly/disk.icns
diff --git a/mail/branding/nightly/dsstore b/mail/branding/nightly/dsstore
new file mode 100644
index 000000000..ad6e1ef5b
--- /dev/null
+++ b/mail/branding/nightly/dsstore
diff --git a/mail/branding/nightly/jar.mn b/mail/branding/nightly/jar.mn
new file mode 100644
index 000000000..40337de09
--- /dev/null
+++ b/mail/branding/nightly/jar.mn
@@ -0,0 +1,15 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+messenger.jar:
+% content branding %content/branding/
+  content/branding/about-background.png             (content/about-background.png)
+  content/branding/about-logo.png                   (content/about-logo.png)
+  content/branding/about-wordmark.png               (content/about-wordmark.png)
+  content/branding/about.png                        (content/about.png)
+  content/branding/icon48.png                       (content/icon48.png)
+  content/branding/icon64.png                       (content/icon64.png)
+  content/branding/aboutDialog.css                  (content/aboutDialog.css)
+  ../classic/skin/classic/messenger/icons/new-mail-alert.png       (content/icon48.png)
diff --git a/mail/branding/nightly/locales/en-US/brand.dtd b/mail/branding/nightly/locales/en-US/brand.dtd
new file mode 100644
index 000000000..8870b0168
--- /dev/null
+++ b/mail/branding/nightly/locales/en-US/brand.dtd
@@ -0,0 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY  brandShortName        "Daily">
+<!ENTITY  brandShorterName      "Daily">
+<!ENTITY  brandFullName         "Daily">
+<!ENTITY  vendorShortName       "mozilla.org">
+<!ENTITY  trademarkInfo.part1   " ">
diff --git a/mail/branding/nightly/locales/en-US/brand.properties b/mail/branding/nightly/locales/en-US/brand.properties
new file mode 100644
index 000000000..a8688cf43
--- /dev/null
+++ b/mail/branding/nightly/locales/en-US/brand.properties
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Daily
+brandShorterName=Daily
+brandFullName=Daily
+vendorShortName=mozilla.org
+
diff --git a/mail/branding/nightly/locales/jar.mn b/mail/branding/nightly/locales/jar.mn
new file mode 100644
index 000000000..33806e4b9
--- /dev/null
+++ b/mail/branding/nightly/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Daily branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+  locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mail/branding/nightly/locales/moz.build b/mail/branding/nightly/locales/moz.build
new file mode 100644
index 000000000..e59008d87
--- /dev/null
+++ b/mail/branding/nightly/locales/moz.build
@@ -0,0 +1,8 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
diff --git a/mail/branding/nightly/mailicon16.png b/mail/branding/nightly/mailicon16.png
new file mode 100644
index 000000000..ba7c232ff
--- /dev/null
+++ b/mail/branding/nightly/mailicon16.png
diff --git a/mail/branding/nightly/mailicon22.png b/mail/branding/nightly/mailicon22.png
new file mode 100644
index 000000000..1f909eb3c
--- /dev/null
+++ b/mail/branding/nightly/mailicon22.png
diff --git a/mail/branding/nightly/mailicon24.png b/mail/branding/nightly/mailicon24.png
new file mode 100644
index 000000000..461f7bc02
--- /dev/null
+++ b/mail/branding/nightly/mailicon24.png
diff --git a/mail/branding/nightly/mailicon256.png b/mail/branding/nightly/mailicon256.png
new file mode 100644
index 000000000..deee95bce
--- /dev/null
+++ b/mail/branding/nightly/mailicon256.png
diff --git a/mail/branding/nightly/mailicon32.png b/mail/branding/nightly/mailicon32.png
new file mode 100644
index 000000000..254ebb6f1
--- /dev/null
+++ b/mail/branding/nightly/mailicon32.png
diff --git a/mail/branding/nightly/mailicon48.png b/mail/branding/nightly/mailicon48.png
new file mode 100644
index 000000000..626deab27
--- /dev/null
+++ b/mail/branding/nightly/mailicon48.png
diff --git a/mail/branding/nightly/moz.build b/mail/branding/nightly/moz.build
new file mode 100644
index 000000000..b032e9d82
--- /dev/null
+++ b/mail/branding/nightly/moz.build
@@ -0,0 +1,21 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['locales']
+
+JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'thunderbird-branding.js',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+  FINAL_TARGET_FILES += [
+      'thunderbird.VisualElementsManifest.xml',
+  ]
+  FINAL_TARGET_FILES.VisualElements += [
+      'VisualElements_150.png',
+      'VisualElements_70.png',
+  ]
diff --git a/mail/branding/nightly/thunderbird-branding.js b/mail/branding/nightly/thunderbird-branding.js
new file mode 100644
index 000000000..818827a57
--- /dev/null
+++ b/mail/branding/nightly/thunderbird-branding.js
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Default start page
+pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+// start page override to load after an update
+pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+// Interval: Time between checks for a new version (in seconds)
+// nightly=1 hour, official=24 hours
+pref("app.update.interval", 3600);
+
+// The time interval between the downloading of mar file chunks in the
+// background (in seconds)
+pref("app.update.download.backgroundInterval", 60);
+
+// Give the user x seconds to react before showing the big UI. nightly=1 hour
+pref("app.update.promptWaitTime", 3600);
+
+pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
diff --git a/mail/branding/nightly/thunderbird.VisualElementsManifest.xml b/mail/branding/nightly/thunderbird.VisualElementsManifest.xml
new file mode 100644
index 000000000..b313bc742
--- /dev/null
+++ b/mail/branding/nightly/thunderbird.VisualElementsManifest.xml
@@ -0,0 +1,8 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='VisualElements\VisualElements_150.png'
+      Square70x70Logo='VisualElements\VisualElements_70.png'
+      ForegroundText='light'
+      BackgroundColor='#ce5c00'/>
+</Application>
diff --git a/mail/branding/nightly/thunderbird.icns b/mail/branding/nightly/thunderbird.icns
new file mode 100644
index 000000000..21c90bd4b
--- /dev/null
+++ b/mail/branding/nightly/thunderbird.icns
diff --git a/mail/branding/nightly/thunderbird.ico b/mail/branding/nightly/thunderbird.ico
new file mode 100644
index 000000000..0ad116740
--- /dev/null
+++ b/mail/branding/nightly/thunderbird.ico
diff --git a/mail/branding/nightly/windows/messengerWindow.ico b/mail/branding/nightly/windows/messengerWindow.ico
new file mode 100644
index 000000000..ff6094cb7
--- /dev/null
+++ b/mail/branding/nightly/windows/messengerWindow.ico
diff --git a/mail/branding/nightly/wizHeader.bmp b/mail/branding/nightly/wizHeader.bmp
new file mode 100644
index 000000000..17d970037
--- /dev/null
+++ b/mail/branding/nightly/wizHeader.bmp
diff --git a/mail/branding/nightly/wizHeaderRTL.bmp b/mail/branding/nightly/wizHeaderRTL.bmp
new file mode 100644
index 000000000..0e12da134
--- /dev/null
+++ b/mail/branding/nightly/wizHeaderRTL.bmp
diff --git a/mail/branding/nightly/wizWatermark.bmp b/mail/branding/nightly/wizWatermark.bmp
new file mode 100644
index 000000000..2f54d6645
--- /dev/null
+++ b/mail/branding/nightly/wizWatermark.bmp
diff --git a/mail/branding/unofficial/background.png b/mail/branding/unofficial/background.png
deleted file mode 100644
index e52f31d05..000000000
--- a/mail/branding/unofficial/background.png
+++ /dev/null
diff --git a/mail/branding/unofficial/content/about-logo.png b/mail/branding/unofficial/content/about-logo.png
deleted file mode 100644
index 5aa9bcaf3..000000000
--- a/mail/branding/unofficial/content/about-logo.png
+++ /dev/null
diff --git a/mail/branding/unofficial/content/about-wordmark.png b/mail/branding/unofficial/content/about-wordmark.png
deleted file mode 100644
index ed742ec34..000000000
--- a/mail/branding/unofficial/content/about-wordmark.png
+++ /dev/null
diff --git a/mail/branding/unofficial/content/about.png b/mail/branding/unofficial/content/about.png
deleted file mode 100644
index 2e722bfc0..000000000
--- a/mail/branding/unofficial/content/about.png
+++ /dev/null
diff --git a/mail/branding/unofficial/content/aboutDialog.css b/mail/branding/unofficial/content/aboutDialog.css
deleted file mode 100644
index afeb45c14..000000000
--- a/mail/branding/unofficial/content/aboutDialog.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#aboutDialogContainer {
-  background-image: linear-gradient(to top, #c0c0c0 0%,#ffffff 100%);
-  background-repeat: no-repeat;
-  background-color: #ffa26f;
-  color: #000;
-}
-
-#leftBox {
-  background-image: url("chrome://branding/content/about-logo.png");
-  background-repeat: no-repeat;
-  /* min-width and min-height create room for the logo */
-  min-width: 210px;
-  min-height: 210px;
-  margin-top: 20px;
-  -moz-margin-start: 30px;
-}
-
-.text-link {
-  color: #338 !important;
-}
-
-.bottom-link {
-  color: #000 !important;
-}
-
-#rightBox {
-  /* this margin prevents text from overlapping the logo image */
-  margin-left: 30px;
-  margin-right: 20px;
-}
-
-#bottomBox {
-  background-color: rgba(255,255,255,.7);
-}
diff --git a/mail/branding/unofficial/content/icon48.png b/mail/branding/unofficial/content/icon48.png
deleted file mode 100644
index fe3f2ade9..000000000
--- a/mail/branding/unofficial/content/icon48.png
+++ /dev/null
diff --git a/mail/branding/unofficial/content/icon64.png b/mail/branding/unofficial/content/icon64.png
deleted file mode 100644
index 3631a1e01..000000000
--- a/mail/branding/unofficial/content/icon64.png
+++ /dev/null
diff --git a/mail/branding/unofficial/disk.icns b/mail/branding/unofficial/disk.icns
deleted file mode 100644
index c0c60c03e..000000000
--- a/mail/branding/unofficial/disk.icns
+++ /dev/null
diff --git a/mail/branding/unofficial/mailicon16.png b/mail/branding/unofficial/mailicon16.png
deleted file mode 100644
index cefbc7d7c..000000000
--- a/mail/branding/unofficial/mailicon16.png
+++ /dev/null
diff --git a/mail/branding/unofficial/mailicon22.png b/mail/branding/unofficial/mailicon22.png
deleted file mode 100644
index a485c9eab..000000000
--- a/mail/branding/unofficial/mailicon22.png
+++ /dev/null
diff --git a/mail/branding/unofficial/mailicon24.png b/mail/branding/unofficial/mailicon24.png
deleted file mode 100644
index d76412c9f..000000000
--- a/mail/branding/unofficial/mailicon24.png
+++ /dev/null
diff --git a/mail/branding/unofficial/mailicon256.png b/mail/branding/unofficial/mailicon256.png
deleted file mode 100644
index c813bfba9..000000000
--- a/mail/branding/unofficial/mailicon256.png
+++ /dev/null
diff --git a/mail/branding/unofficial/mailicon32.png b/mail/branding/unofficial/mailicon32.png
deleted file mode 100644
index e4dab73a9..000000000
--- a/mail/branding/unofficial/mailicon32.png
+++ /dev/null
diff --git a/mail/branding/unofficial/mailicon48.png b/mail/branding/unofficial/mailicon48.png
deleted file mode 100644
index fe3f2ade9..000000000
--- a/mail/branding/unofficial/mailicon48.png
+++ /dev/null
diff --git a/mail/branding/unofficial/thunderbird.icns b/mail/branding/unofficial/thunderbird.icns
deleted file mode 100644
index 5406a13fb..000000000
--- a/mail/branding/unofficial/thunderbird.icns
+++ /dev/null
diff --git a/mail/branding/unofficial/thunderbird.ico b/mail/branding/unofficial/thunderbird.ico
deleted file mode 100644
index 8ca2d4a21..000000000
--- a/mail/branding/unofficial/thunderbird.ico
+++ /dev/null
diff --git a/mail/branding/unofficial/windows/messengerWindow.ico b/mail/branding/unofficial/windows/messengerWindow.ico
deleted file mode 100644
index 8ca2d4a21..000000000
--- a/mail/branding/unofficial/windows/messengerWindow.ico
+++ /dev/null
diff --git a/mail/branding/unofficial/wizHeader.bmp b/mail/branding/unofficial/wizHeader.bmp
deleted file mode 100644
index f55d4f893..000000000
--- a/mail/branding/unofficial/wizHeader.bmp
+++ /dev/null
diff --git a/mail/branding/unofficial/wizHeaderRTL.bmp b/mail/branding/unofficial/wizHeaderRTL.bmp
deleted file mode 100644
index e3f482bb8..000000000
--- a/mail/branding/unofficial/wizHeaderRTL.bmp
+++ /dev/null
diff --git a/mail/branding/unofficial/wizWatermark.bmp b/mail/branding/unofficial/wizWatermark.bmp
deleted file mode 100644
index 489bb4e05..000000000
--- a/mail/branding/unofficial/wizWatermark.bmp
+++ /dev/null
diff --git a/mail/confvars.sh b/mail/confvars.sh
index 27debe9e5..b20bfc343 100644
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -20,6 +20,13 @@ if test "$OS_ARCH" = "WINNT" -o \
   MOZ_BUNDLED_FONTS=1
 fi
 
+if test "$OS_ARCH" = "WINNT"; then
+  if ! test "$HAVE_64BIT_BUILD"; then
+    MOZ_VERIFY_MAR_SIGNATURE=1
+    MOZ_MAINTENANCE_SERVICE=1
+  fi
+fi
+
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 
@@ -29,7 +36,9 @@ MOZ_APP_VERSION_DISPLAY_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.
 MOZ_APP_VERSION_DISPLAY=`cat $MOZ_APP_VERSION_DISPLAY_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
-MOZ_BRANDING_DIRECTORY=${_topsrcdir}/$MOZ_BUILD_APP/branding/unofficial
+MOZ_UA_BUILDID=20100101
+
+MOZ_BRANDING_DIRECTORY=mail/branding/aurora
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.