diff --git a/helpers/DATA/thunderbird/branding/content/about-background.png b/helpers/DATA/thunderbird/branding/content/about-background.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ecda0a41840887530d8a4b3fb9cb2071b94217c
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/content/about-background.png differ
diff --git a/helpers/DATA/thunderbird/branding/content/about-logo.png b/helpers/DATA/thunderbird/branding/content/about-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca8927a8ddcad96a6f1df613371a926bb95f3bd
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/content/about-logo.png differ
diff --git a/helpers/DATA/thunderbird/branding/content/about-wordmark.png b/helpers/DATA/thunderbird/branding/content/about-wordmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0b03473b0aa2e967bd71a0f4fb4331bbf8b7b61
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/content/about-wordmark.png differ
diff --git a/helpers/DATA/thunderbird/branding/content/about.png b/helpers/DATA/thunderbird/branding/content/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea2360f1335429b0da320170080bff3ad486fd60
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/content/about.png differ
diff --git a/helpers/DATA/thunderbird/branding/content/icon48.png b/helpers/DATA/thunderbird/branding/content/icon48.png
new file mode 100644
index 0000000000000000000000000000000000000000..6472c47e811f21734c900ec9784fd31e76de7d33
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/content/icon48.png differ
diff --git a/helpers/DATA/thunderbird/branding/content/icon64.png b/helpers/DATA/thunderbird/branding/content/icon64.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc678b1b7d7a2be951a32351e0d517e61faf1785
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/content/icon64.png differ
diff --git a/helpers/DATA/thunderbird/branding/mailicon16.png b/helpers/DATA/thunderbird/branding/mailicon16.png
new file mode 100644
index 0000000000000000000000000000000000000000..412c0aa5f3a09f6caa1ac0da7845791acfa8fbf9
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/mailicon16.png differ
diff --git a/helpers/DATA/thunderbird/branding/mailicon22.png b/helpers/DATA/thunderbird/branding/mailicon22.png
new file mode 100644
index 0000000000000000000000000000000000000000..29904ba73c6bc8a015841b2faa79ff3fb1114ac7
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/mailicon22.png differ
diff --git a/helpers/DATA/thunderbird/branding/mailicon24.png b/helpers/DATA/thunderbird/branding/mailicon24.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ba411a301c6c4ac31b574216de72d2453d33303
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/mailicon24.png differ
diff --git a/helpers/DATA/thunderbird/branding/mailicon256.png b/helpers/DATA/thunderbird/branding/mailicon256.png
new file mode 100644
index 0000000000000000000000000000000000000000..5147e89f1bc0be149154b69fd1e69bdfb8383908
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/mailicon256.png differ
diff --git a/helpers/DATA/thunderbird/branding/mailicon32.png b/helpers/DATA/thunderbird/branding/mailicon32.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b6ff34748cc20a78c28ff32427c563f973acf55
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/mailicon32.png differ
diff --git a/helpers/DATA/thunderbird/branding/mailicon48.png b/helpers/DATA/thunderbird/branding/mailicon48.png
new file mode 100644
index 0000000000000000000000000000000000000000..6472c47e811f21734c900ec9784fd31e76de7d33
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/mailicon48.png differ
diff --git a/helpers/DATA/thunderbird/branding/wizHeader.bmp b/helpers/DATA/thunderbird/branding/wizHeader.bmp
new file mode 100755
index 0000000000000000000000000000000000000000..bf7ca157adaae6293d5e48c523be040f6d5177bd
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/wizHeader.bmp differ
diff --git a/helpers/DATA/thunderbird/branding/wizHeaderRTL.bmp b/helpers/DATA/thunderbird/branding/wizHeaderRTL.bmp
new file mode 100755
index 0000000000000000000000000000000000000000..fb0c9aec9fc3d63e942095029b8130eaa45844ba
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/wizHeaderRTL.bmp differ
diff --git a/helpers/DATA/thunderbird/branding/wizWatermark.bmp b/helpers/DATA/thunderbird/branding/wizWatermark.bmp
new file mode 100755
index 0000000000000000000000000000000000000000..644eeecac8dd4fd1eecdadbec787e43fe95b9506
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/wizWatermark.bmp differ
diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird
index a2194a9629e62bf573db131b0a30cc9b00cace39..e6bc4372aca0589b774145fd8978cd32fd1811d9 100644
--- a/helpers/make-thunderbird
+++ b/helpers/make-thunderbird
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
#
-# Copyright (C) 2014-2018 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2018 Ruben Rodriguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,9 +21,14 @@ VERSION=1
. ./config
+cp $DATA/branding/* mail/branding/nightly/ -r
+
cat << EOF >> debian/vendor.js
// Trisquel settings
+pref("mail.provider.enabled", false);
+pref("mail.provider.providerList", "");
+pref("mail.provider.suggestFromName", "");
pref("mail.shell.checkDefaultClient", false);
pref("spellchecker.dictionaries.download.url", "http://dictionaries.mozdev.org/installation.html");
pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/Icedove");
@@ -31,8 +36,81 @@ pref("extensions.blocklist.enabled", false);
pref("mail.rights.version", 1);
pref("toolkit.telemetry.prompted", 2);
pref("toolkit.telemetry.rejected", true);
+pref("mailnews.start_page.enabled", false);
+pref("mailnews.start_page.url", "");
+pref("mailnews.start_page.override_url", "");
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
+pref("browser.search.update", false);
+pref("extensions.update.enabled", false);
+pref("network.cookie.cookieBehavior", 2);
+pref("app.releaseNotesURL", "http://trisquel.info/mailclient");
+pref("pfs.datasource.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+pref("pfs.filehint.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
+pref("browser.search.defaultenginename", "Wikipedia (en)");
+pref("browser.search.order.1", "Wikipedia (en)");
+pref("browser.search.defaultenginename", "Wikipedia (en)");
+pref("browser.search.showOneOffButtons", false);
+pref("browser.search.suggest.enabled",false);
+EOF
+
+sed '/enable-tests/d' -i debian/config/mozconfig.in
+
+
+sed '/^MOZ_PKG_NAME/s/.*/MOZ_PKG_NAME=icedove/' -i debian/build/config.mk
+
+cat << EOF >> debian/build/config.mk
+
+# Trisquel settings
+MOZ_FORCE_UNOFFICIAL_BRANDING = 1
+MOZ_WANT_UNIT_TESTS = 0
+MOZ_ENABLE_BREAKPAD = 0
EOF
-changelog "Custom settings for Trisquel"
+# Replace Thunderbird branding
+find -type d | grep thunderbird | xargs rename s/thunderbird/icedove/
+find -type d | grep thunderbird | xargs rename s/thunderbird/icedove/
+find -type f | grep thunderbird | xargs rename s/thunderbird/icedove/
+find -type f | grep Thunderbird | xargs rename s/Thunderbird/Icedove/
+
+SEDSCRIPT="
+s/Mozilla Thunderbird/Icedove/g;
+s/thunderbird/icedove/g;
+s/Thunderbird/Icedove/g;
+s/THUNDERBIRD/ICEDOVE/g;
+s/ Mozilla / Trisquel /g;
+s|PACKAGES/icedove|PACKAGES/thunderbird|g;
+s/iceweasel, icedove/iceweasel, thunderbird/g;
+s/Replaces: icedove/Replaces: thunderbird/g;
+s|www.mozilla.com/icedove/central|trisquel.info/browser|g;
+s|mozilla.com/plugincheck|trisquel.info/browser|g;
+s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
+
+s/Trisquel Public/Mozilla Public/g;
+s/Trisquel Foundation/Mozilla Foundation/g;
+s/Trisquel Corporation/Mozilla Corporation/g;
+"
+echo "Running batch replace operation"
+find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
+
+replace Daily Icedove mail/branding/
+sed '/.*<description.*communityExperimentalDesc/,/\/description/d' -i ./mail/base/content/aboutDialog.xul
+sed '/.*<description.*communityDesc/,/\/description/d' -i ./mail/base/content/aboutDialog.xul
+sed '/.*<description.*contributeDesc/,/\/description/d' -i ./mail/base/content/aboutDialog.xul
+
+# We went too far...
+sed s/Trisquel/Mozilla/ l10n/compare-locales/scripts/compare-locales -i
+sed s/Trisquel/Mozilla/ l10n/compare-locales/setup.py -i
+
+sed '/^Source/s/.*/Source: thunderbird/' -i debian/control.in
+sed 's/Provides: mail-reader,/Provides: mail-reader, thunderbird,/' -i debian/control.in
+sed "s/Provides.*/Provides: icedove-locale-@LANGCODE@/" -i debian/control.langpacks
+
+debian/rules debian/control
+touch -d "yesterday" debian/control
+debian/rules debian/control
+
+changelog "Rebranded for Trisquel"
compile