diff --git a/overlays/default.nix b/overlays/default.nix
index 883d1688..71bdd539 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -7,4 +7,5 @@
   ffmpeg-foodogsquared = import ./ffmpeg-foodogsquared;
   firefox-foodogsquared = import ./firefox-foodogsquared;
   blender-foodogsquared = import ./blender-foodogsquared;
+  thunderbird-foodogsquared = import ./thunderbird-foodogsquared;
 }
diff --git a/overlays/thunderbird-foodogsquared/default.nix b/overlays/thunderbird-foodogsquared/default.nix
new file mode 100644
index 00000000..3a1c4933
--- /dev/null
+++ b/overlays/thunderbird-foodogsquared/default.nix
@@ -0,0 +1,36 @@
+{ final, prev }:
+
+
+{
+  thunderbird-foodogsquared = with prev; wrapThunderbird thunderbird {
+    extraPolicies = {
+      AppsAutoUpdate = false;
+      DisableAppUpdate = false;
+
+      ExtensionSettings = let
+        thunderbirdAddon = name:
+          "https://addons.thunderbird.net/thunderbird/downloads/latest/${name}/latest.xpi";
+
+        extensions = {
+          "uBlock0@raymondhill.net" = {
+            installation_mode = "force_installed";
+            installation_url = thunderbirdAddon "ublock-origin";
+          };
+
+          "{e6696d02-466a-11e3-a162-04e36188709b}".installation_url = thunderbirdAddon "eds-calendar-integration";
+          "quickfolders@curious.be".installation_url = thunderbirdAddon "quickfolders-tabbed-folders";
+        };
+
+        applyInstallationMode = name: value:
+          lib.nameValuePair name (value //
+            (lib.optionalAttrs
+              (! (lib.hasAttrByPath [ "installation_mode" ] value))
+              { installation_mode = "normal_installed"; }));
+      in
+        lib.mapAttrs' applyInstallationMode extensions;
+
+      OfferToSaveLoginsDefault = false;
+      PasswordManagerEnabled = false;
+    };
+  };
+}