diff --git a/homes/x86_64-linux/mike@blade/default.nix b/homes/x86_64-linux/mike@blade/default.nix
index 6d29861..ed060cd 100644
--- a/homes/x86_64-linux/mike@blade/default.nix
+++ b/homes/x86_64-linux/mike@blade/default.nix
@@ -38,9 +38,7 @@ in
     vesktop
     keepassxc
 
-    dotties.bluemail-with-gpu
     firefox
-    thunderbird
 
     playerctl
 
diff --git a/modules/nixos/apps/thunderbird/default.nix b/modules/nixos/apps/thunderbird/default.nix
new file mode 100644
index 0000000..475356f
--- /dev/null
+++ b/modules/nixos/apps/thunderbird/default.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  namespace,
+  config,
+  ...
+}:
+let
+  inherit (lib) mkIf mkOption;
+  inherit (lib.${namespace}) mkOpt;
+
+  cfg = config.${namespace}.apps.thunderbird;
+in
+{
+  options.${namespace}.apps.thunderbird = {
+    enable = mkOpt lib.types.bool false "whether to enable thunderbird mail client.";
+    exchangeSupport = mkOpt lib.types.bool true "whether to enable exchange support for mail clients";
+  };
+
+  config = mkIf cfg.enable {
+    programs.thunderbird.enable = true;
+
+    services.davmail = mkIf cfg.exchangeSupport {
+      enable = true;
+      url = "https://outlook.office365.com/EWS/Exchange.asmx";
+    };
+  };
+
+}
diff --git a/systems/x86_64-linux/blade/default.nix b/systems/x86_64-linux/blade/default.nix
index 5732c57..4842a71 100644
--- a/systems/x86_64-linux/blade/default.nix
+++ b/systems/x86_64-linux/blade/default.nix
@@ -35,6 +35,7 @@ in
 
     apps = {
       thunar = enabled;
+      thunderbird = enabled;
     };
 
     dms.sddm = {