diff --git a/nixos/email-accounts.nix b/nixos/email-accounts.nix
index ac26ea88..0fcfdab1 100644
--- a/nixos/email-accounts.nix
+++ b/nixos/email-accounts.nix
@@ -1,4 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
+let
+  unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
+in
 {
   home-manager.users.cyryl = { ... }: {
     accounts.email.accounts.cyplo = {
@@ -10,7 +13,10 @@
       imap = {
         host = "127.0.0.1";
         port = 1143;
-        tls.enable = false;
+        tls = {
+          enable = false;
+          useStartTls = false;
+        };
       };
       smtp = {
         host = "127.0.0.1";
@@ -18,8 +24,7 @@
         tls.enable = false;
       };
       notmuch.enable = true;
-      astroid.enable = true;
-      neomutt.enable = true;
+      himalaya.enable = true;
       msmtp.enable = true;
       passwordCommand = "${pkgs.pass}/bin/pass proton-bridge";
       offlineimap.enable = true;
@@ -41,13 +46,11 @@
       enable = true;
     };
 
-    programs.astroid = {
-      enable = true;
-      pollScript = "${pkgs.notmuch}/bin/notmuch new";
-    };
-    programs.neomutt = {
+    programs.himalaya = {
       enable = true;
+      package = unstable.himalaya;
     };
+
     home.packages = with pkgs; [
       hydroxide
     ];
@@ -55,7 +58,7 @@
     systemd.user.services."hydroxide" = {
       Unit.Description = "Bridge to ProtonMail";
       Install.WantedBy = [ "default.target" ];
-      Service.ExecStart = "${pkgs.hydroxide}/bin/hydroxide serve";
+      Service.ExecStart = "${unstable.hydroxide}/bin/hydroxide serve";
     };
 
   };