diff --git a/.gitignore b/.gitignore
index 2e7cfdb..4801c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 entropy/mail/.mbsyncrc
 entropy/mail/.msmtprc
-entropy/mail/neomutt/signature.txt
-entropy/mail/neomutt/notmuch-hook.sh
-entropy/mail/neomutt/whoami.muttrc
 entropy/vpn/credentials.txt
 entropy/vpn/openconnect.txt
 
diff --git a/.gitmodules b/.gitmodules
index 45b4e91..ea02eb8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "tycho/mail/neomutt/themes"]
 	path = tycho/mail/neomutt/themes
 	url = git@github.com:sheoak/neomutt-powerline-nerdfonts.git
+[submodule "entropy/mail/neomutt/mailsettings"]
+	path = entropy/mail/neomutt/mailsettings
+	url = git@code.dummyco.de:feliix42/mailsettings.git
diff --git a/entropy/mail/neomutt/accounts/tudresden.muttrc b/entropy/mail/neomutt/accounts/tudresden.muttrc
index 4461425..7eb8ab1 100644
--- a/entropy/mail/neomutt/accounts/tudresden.muttrc
+++ b/entropy/mail/neomutt/accounts/tudresden.muttrc
@@ -12,7 +12,7 @@ set record              = =Sent
 # NOTE: disabled for notmuch
 # mailboxes "=Inbox" "=Trash" "=Sent" "=Drafts" 
 
-macro index \CS "<shell-escape>mbsync tu-dresden<enter>"
+macro index \CS "<shell-escape>mbsync -a; ~/.config/neomutt/notmuch-hook.sh<enter>"
 
 set signature           = "~/.config/neomutt/signature.txt"
 
diff --git a/entropy/mail/neomutt/mailsettings b/entropy/mail/neomutt/mailsettings
new file mode 160000
index 0000000..03d0a78
--- /dev/null
+++ b/entropy/mail/neomutt/mailsettings
@@ -0,0 +1 @@
+Subproject commit 03d0a78203b5aa87c49ee84274cd90f45b767345
diff --git a/entropy/mail/neomutt/notmuch-hook.sh b/entropy/mail/neomutt/notmuch-hook.sh
new file mode 120000
index 0000000..ba3d654
--- /dev/null
+++ b/entropy/mail/neomutt/notmuch-hook.sh
@@ -0,0 +1 @@
+mailsettings/notmuch-hook.sh
\ No newline at end of file
diff --git a/entropy/mail/neomutt/signature.txt b/entropy/mail/neomutt/signature.txt
new file mode 120000
index 0000000..f2d3b15
--- /dev/null
+++ b/entropy/mail/neomutt/signature.txt
@@ -0,0 +1 @@
+mailsettings/signature.txt
\ No newline at end of file
diff --git a/entropy/mail/neomutt/whoami.muttrc b/entropy/mail/neomutt/whoami.muttrc
new file mode 120000
index 0000000..2a8e3fe
--- /dev/null
+++ b/entropy/mail/neomutt/whoami.muttrc
@@ -0,0 +1 @@
+mailsettings/whoami.muttrc
\ No newline at end of file
diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix
index 190fe54..a728b8a 100644
--- a/entropy/nixos/configuration.nix
+++ b/entropy/nixos/configuration.nix
@@ -203,6 +203,7 @@ in
     msmtp
     neomutt urlview
     notmuch
+    aspell # spell checking in mail
     ## Rust
     rustup
     cargo-flamegraph
diff --git a/entropy/sway/config b/entropy/sway/config
index d8f8961..c41c05e 100644
--- a/entropy/sway/config
+++ b/entropy/sway/config
@@ -263,7 +263,7 @@ for_window [title="zoom"] floating enable
 bindsym $mod+c exec grimshot --notify save area 
 
 # quick access to mail
-bindsym $mod+m exec 'alacritty -e neomutt -f "notmuch://?query=tag:unread"'
+bindsym $mod+m exec 'alacritty -e neomutt -f "notmuch://?query=tag:unread and tag:inbox"'
 
 bindsym $mod+x exec 'swaylock --screenshots --effect-blur 5x5 --effect-greyscale --fade-in 0.5'
 
diff --git a/entropy/waybar/config b/entropy/waybar/config
index 65b92fe..95f74a9 100644
--- a/entropy/waybar/config
+++ b/entropy/waybar/config
@@ -77,7 +77,7 @@
         "format": " {}",
         "max-length": 10,
         "interval": 60,
-        "exec": "notmuch count tag:unread",
+        "exec": "notmuch count tag:unread and tag:inbox",
         "exec-if": "[ $(notmuch count tag:unread) != 0 ]",
         "on-click": "alacritty -e neomutt -f 'notmuch://?query=tag:unread'"
     }