diff --git a/modules/capabilities/pim.nix b/modules/capabilities/pim.nix
index 54037ee..5e5799a 100644
--- a/modules/capabilities/pim.nix
+++ b/modules/capabilities/pim.nix
@@ -8,19 +8,11 @@ let
   homeModules = config.flake.modules.homeManager;
 in
 {
-  flake.modules.nixos.evolution =
-    { pkgs, ... }:
-    {
-      programs.evolution = {
-        enable = true;
-        plugins = [ pkgs.evolution-ews ];
-      };
-    };
-
   flake.modules.homeManager.email =
     {
       config,
       lib,
+      pkgs,
       ...
     }:
     let
@@ -71,6 +63,9 @@ in
         };
     in
     {
+      home.packages = [ pkgs.mailspring ];
+      xdg.mimeApps.defaultApplicationPackages = [ pkgs.mailspring ];
+
       programs.thunderbird = {
         enable = true;
         profiles.${config.home.username} = {
diff --git a/modules/profiles/workstation-base.nix b/modules/profiles/workstation-base.nix
index a67496a..2c8035d 100644
--- a/modules/profiles/workstation-base.nix
+++ b/modules/profiles/workstation-base.nix
@@ -13,7 +13,6 @@ in
       nixosModules.bluetooth
       nixosModules.flatpak
       nixosModules.fonts
-      nixosModules.evolution
       nixosModules.network-manager
       nixosModules.nftables-firewall
       nixosModules.niri