diff --git a/home/default.nix b/home/default.nix
index 985407a..e405eab 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -41,7 +41,7 @@
     # email
     msmtp
     notmuch
-    isync
+    # isync
     w3m
     openssl
     gnupg
@@ -81,7 +81,7 @@
     ./R.nix
     ./nvim
     ./fish.nix
-    ./neomutt.nix
+    ./mail.nix
     ./tex.nix
     ./openconnect.nix
   ];
diff --git a/home/neomutt.nix b/home/mail/default.nix
similarity index 79%
rename from home/neomutt.nix
rename to home/mail/default.nix
index 0e93337..d4c2d53 100644
--- a/home/neomutt.nix
+++ b/home/mail/default.nix
@@ -2,6 +2,7 @@
 
 {
   accounts.email = {
+    maildirBasePath = "${config.xdg.dataHome}/mail/imap";
     accounts.ktiu = {
       primary = true;
       address = "till@ktiu.net";
@@ -10,11 +11,12 @@
       smtp.host = "shorbut.ktiu.net";
       userName = "till";
       neomutt.enable = true;
-      passwordCommand = "echo 'hi'";
+      mbsync.enable = true;
+      passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till";
     };
   };
+  programs.mbsync.enable = true;
   programs.neomutt = {
-    # extraConfig = builtins.readFile ./config.vim;
     enable = true;
     vimKeys = true;
     binds = [
@@ -23,6 +25,7 @@
     macros = [
       { key = "c"; action = "<enter-command>set signature=$my_signature<enter><mail>"; map = ["index" "pager"]; }
     ];
+    extraConfig = builtins.readFile ./neomutt.conf;
     # xdg.configFile."nvim/autocommmands.vim".source = ./autocommands.vim;
     # xdg.configFile."nvim/ftplugin/markdown.vim".source = ./ftplugin/markdown.vim;
     # xdg.configFile."nvim/ftplugin/r.vim".source = ./ftplugin/r.vim;
diff --git a/home/mail/neomutt.conf b/home/mail/neomutt.conf
new file mode 100644
index 0000000..af04619
--- /dev/null
+++ b/home/mail/neomutt.conf
@@ -0,0 +1,51 @@
+# set mailcap_path = ~/.config/neomutt/mailcap
+# set tmpdir = ~/.local/share/neomutt/tmp
+set alias_file = ${config.xdg.dataHome}/neomutt/aliases.neomuttrc
+# set my_download_folder = ~/tmp
+
+# Caching
+set header_cache = ${config.xdg.dataHome}/neomutt/cache/headers
+set message_cachedir = ${config.xdg.dataHome}/neomutt/cache/bodies
+set header_cache_backend = "lmdb"
+
+# Basic options
+unset wait_key
+set mbox_type = Maildir
+# set delete
+set mail_check_stats
+unset confirm_append
+unset beep
+unset mark_old
+set sleep_time = 0
+# set shell = /bin/bash
+
+# Sending
+# set sendmail = "/home/till/.nix-profile/bin/sendmail -C /home/till/.config/msmtp/msmtprc"
+set use_envelope_from
+unset reverse_realname
+
+# Searching
+# set nm_default_url = "notmuch:///home/till/.local/share/neomutt/mail/"
+
+# Multi-account setup
+# source ~/.config/neomutt/accounts/dkg.neomuttrc
+# source ~/.config/neomutt/accounts/gu.neomuttrc
+# bind index,pager g noop
+
+# folder-hook $folder/gu/ source       ~/.config/neomutt/accounts/gu.neomuttrc
+# folder-hook $folder/systemli/ source ~/.config/neomutt/accounts/systemli.neomuttrc
+# folder-hook $folder/ks/ source       ~/.config/neomutt/accounts/ks.neomuttrc
+# folder-hook $folder/gmail/ source    ~/.config/neomutt/accounts/gmail.neomuttrc
+# folder-hook $folder/ktiu/ source     ~/.config/neomutt/accounts/ktiu.neomuttrc
+# folder-hook $folder/dkg/ source      ~/.config/neomutt/accounts/dkg.neomuttrc
+# folder-hook $folder/papa/ source      ~/.config/neomutt/accounts/papa.neomuttrc
+# folder-hook . source                 ~/.config/neomutt/bindings.neomuttrc
+
+
+# # Source config
+# source ~/.config/neomutt/views.neomuttrc
+# source ~/.config/neomutt/sidebar.neomuttrc
+# source ~/.config/neomutt/colors.neomuttrc
+# source ~/.config/neomutt/smime.neomuttrc
+# source ~/.config/neomutt/pgp.neomuttrc
+# source $alias_file