diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 2b27756..6fa7213 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -36,6 +36,9 @@
         email = "noa@voorwaarts.nl";
         do_sign = true;
       };
+      thunderbird = {
+        enable = true;
+      };
     };
   };
 
@@ -67,7 +70,6 @@
     keepassxc
     yubikey-manager-qt
     yubico-piv-tool
-    thunderbird
   ];
 
 
diff --git a/hosts/muos/home.nix b/hosts/muos/home.nix
index b449432..f255f19 100644
--- a/hosts/muos/home.nix
+++ b/hosts/muos/home.nix
@@ -39,6 +39,9 @@
         email = "noa@voorwaarts.nl";
         do_sign = true;
       };
+      thunderbird = {
+        enable = true;
+      };
     };
   };
 
@@ -70,7 +73,6 @@
     keepassxc
     yubikey-manager-qt
     yubico-piv-tool
-    thunderbird
   ];
 
 
diff --git a/modules/applications/default.nix b/modules/applications/default.nix
index 15eed1b..a489544 100644
--- a/modules/applications/default.nix
+++ b/modules/applications/default.nix
@@ -12,6 +12,7 @@ in
     ./git.nix
     ./kitty.nix
     ./zsh.nix
+    ./thunderbird.nix
   ];
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/applications/thunderbird.nix b/modules/applications/thunderbird.nix
new file mode 100644
index 0000000..6400f6d
--- /dev/null
+++ b/modules/applications/thunderbird.nix
@@ -0,0 +1,75 @@
+{ lib, config, pkgs, ... }:
+let
+  cfg = config.modules.apps.thunderbird;
+in
+{
+  options.modules.apps.thunderbird = {
+    enable = lib.mkEnableOption "enable thunderbird";
+  };
+
+
+  config = lib.mkIf cfg.enable {
+    accounts.email.accounts =
+      let gpg_key = "A16CDCBF1472541F";
+      in
+      {
+        "noa-voorwaarts" = {
+          address = "noa@voorwaarts.nl";
+          gpg = {
+            signByDefault = true;
+            key = gpg_key;
+          };
+          imap = {
+            host = "mail.voorwaarts.nl";
+            port = 993;
+          };
+          primary = true;
+          realName = "Noa Aarts";
+          smtp = {
+            host = "mail.voorwaarts.nl";
+            port = 587;
+            tls.useStartTls = true;
+          };
+          thunderbird.enable = true;
+          userName = "noa@voorwaarts.nl";
+        };
+        "noa-itepastra" = {
+          address = "noa@itepastra.nl";
+          gpg = {
+            signByDefault = true;
+            key = gpg_key;
+          };
+          imap = {
+            host = "mail.itepastra.nl";
+            port = 993;
+          };
+          realName = "Noa Aarts";
+          smtp = {
+            host = "mail.itepastra.nl";
+          };
+          thunderbird.enable = true;
+          userName = "noa@itepastra.nl";
+        };
+        "itepastra-gmail" = {
+          address = "itepastra@gmail.com";
+          flavor = "gmail.com";
+          thunderbird.enable = true;
+          realName = "Noa Aarts";
+          userName = "itepastra";
+        };
+      };
+
+    programs.thunderbird = {
+      enable = true;
+      # TODO: add some default firefox settings
+      package = pkgs.thunderbird;
+      profiles = {
+        "default" = {
+          isDefault = true;
+          withExternalGnupg = true;
+        };
+      };
+    };
+  };
+
+}
diff --git a/modules/default.nix b/modules/default.nix
index d60d951..a23fb55 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,6 +1,6 @@
-{...}:
+{ ... }:
 {
   imports = [
-		./hyprland.nix
+    ./hyprland.nix
   ];
 }