diff --git a/hosts/chris-server/.default.nix.kate-swp b/hosts/chris-server/.default.nix.kate-swp
deleted file mode 100644
index d534e0c..0000000
Binary files a/hosts/chris-server/.default.nix.kate-swp and /dev/null differ
diff --git a/modules/desktop/applications/email.nix b/modules/desktop/applications/email.nix
new file mode 100644
index 0000000..106c364
--- /dev/null
+++ b/modules/desktop/applications/email.nix
@@ -0,0 +1,37 @@
+{ options, config, lib, pkgs, ... }:
+let
+  inherit (lib.modules) mkIf mkForce mkMerge;
+  inherit (lib.attrsets) attrValues;
+
+  cfg = config.modules.desktop.applications.email;
+in
+{
+  options.modules.desktop.applications.email = let
+    inherit (lib.options) mkEnableOption;
+  in {
+    enable = mkEnableOption "Enable email client (thunderbird)";
+  };
+
+  config = mkIf cfg.enable
+  {
+    user.packages = attrValues {
+      inherit (pkgs) thunderbird;
+    };
+
+    accounts.email.account = {
+      kruining = {
+        primary = true;
+        address = "chris@kruinin.eu";
+        thunderbird.enable = true;
+        realName = "Chris Kruining";
+      };
+
+      cgames = {
+        primary = false;
+        address = "chris@cgames.nl";
+        thunderbird.enable = true;
+        realName = "Chris P Bacon";
+      };
+    };
+  };
+}