diff --git a/home-manager-modules/mails/default.nix b/home-manager-modules/mails/default.nix
index 51ff9e1..154678b 100644
--- a/home-manager-modules/mails/default.nix
+++ b/home-manager-modules/mails/default.nix
@@ -14,14 +14,12 @@ with lib;
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ pkgs.notmuch-addrlookup ];
     programs.mbsync.enable = true;
-    programs.neomutt.enable = true;
-    programs.neomutt.package = pkgs.stable.neomutt;
+    programs.mbsync.package = pkgs.stable.isync;
     programs.msmtp.enable = true;
     accounts.email = {
       accounts.ens = {
-        notmuch.enable = true;
+        folders.inbox = "INBOX";
         address = "julien.malka@ens.fr";
         imap.host = "clipper.ens.fr";
         mbsync = {
@@ -41,7 +39,7 @@ with lib;
         userName = "jmalka";
       };
       accounts.work = {
-        notmuch.enable = true;
+        folders.inbox = "INBOX";
         address = "julien@malka.sh";
         imap.host = "mail.luj.fr";
         mbsync = {
@@ -62,7 +60,7 @@ with lib;
       };
 
       accounts.telecom = {
-        notmuch.enable = true;
+        folders.inbox = "INBOX";
         address = "julien.malka@telecom-paris.fr";
         imap.host = "z.imt.fr";
         mbsync = {
@@ -83,7 +81,7 @@ with lib;
       };
 
       accounts.dgnum = {
-        notmuch.enable = true;
+        folders.inbox = "INBOX";
         address = "luj@dgnum.eu";
         imap.host = "kurisu.lahfa.xyz";
         mbsync = {
@@ -110,58 +108,6 @@ with lib;
       frequency = "minutely";
       verbose = true;
     };
-    services.mbsync.postExec = "${pkgs.notmuch}/bin/notmuch new";
-    programs.notmuch = {
-      enable = true;
-      new.tags = [ ];
-      hooks.postNew = ''
-        # julien@malka.sh
-        notmuch tag +work-inbox -- folder:work/Inbox
-        notmuch tag +work-lobsters -- folder:work/Inbox/lobsters
-        notmuch tag +work-dn42  -- folder:work/Inbox/dn42
-        notmuch tag +work-fosdem -- folder:work/Inbox/fosdem
-        notmuch tag +work-frnog -- folder:work/Inbox/frnog
-        notmuch tag +work-github -- folder:work/Inbox/github
-        notmuch tag +work-netdata -- folder:work/Inbox/netdata
-        notmuch tag +work-nixos-discourse -- folder:work/Inbox/nixos-discourse
-        notmuch tag +work-proxmox -- folder:work/Inbox/proxmox
-
-        #julien.malka@ens.fr
-        notmuch tag +ens-inbox path:ens/Inbox/**
-        notmuch tag +ens-bilan-carbone -ens-inbox -- path:ens/Bilan-Carbone/**
-        notmuch tag +ens-dg -ens-inbox -- path:ens/DG/**
-        notmuch tag +ens-cof -ens-inbox -- path:ens/COF/**
-        notmuch tag +ens-fanfare -ens-inbox -- path:ens/Fanfare/**
-        notmuch tag +ens-kfet -ens-inbox -- path:ens/K-Fet/**
-
-
-        #julien.malka@telecom-paris.fr
-        notmuch tag +telecom-inbox -- folder:telecom/Inbox
-        notmuch tag +telecom-gdr-gpl -- folder:telecom/Inbox/gdr-gpl
-        notmuch tag +telecom-gdr-sec -- folder:telecom/Inbox/gdr-sec
-        notmuch tag +telecom-infres-tous -- folder:telecom/Inbox/infres-tous
-        notmuch tag +telecom-tous -- folder:telecom/Inbox/telecom-tous
-
-        #luj@dgnum.eu
-        notmuch tag +dgnum-inbox path:dgnum/Inbox/**
-        notmuch tag +dgnum-bureau -dgnum-inbox -- path:dgnum/Inbox/Bureau/**
-        notmuch tag +dgnum-nixcon -dgnum-inbox -- path:dgnum/Inbox/NixCon/**
-
-        ${pkgs.notifymuch}/bin/notifymuch
-
-      '';
-    };
-
-    xdg.configFile = {
-      "neomutt/neomuttrc".source = lib.mkForce ./neomuttrc;
-      "neomutt/dracula.muttrc".source = lib.mkForce ./dracula.muttrc;
-      "neomutt/ens.profile".source = lib.mkForce ./ens.profile;
-      "neomutt/telecom.profile".source = lib.mkForce ./telecom.profile;
-      "neomutt/work.profile".source = lib.mkForce ./work.profile;
-      "neomutt/discourse.profile".source = lib.mkForce ./discourse.profile;
-      "neomutt/dgnum.profile".source = lib.mkForce ./dgnum.profile;
-      "notifymuch/notifymuch.cfg".source = lib.mkForce ./notifymuch;
-    };
 
   };
 }