diff --git a/Makefile b/Makefile
index 9dee953..08470a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 FILES = bashrc bash_profile vimrc zshrc gitconfig screenrc commonshrc liquidpromptrc \
-	gnomerc muttrc pentadactylrc mailcap latexmkrc ctags \
+	gnomerc muttrc neomuttrc pentadactylrc mailcap latexmkrc ctags \
 	i3/config i3status.conf msmtprc spacemacs emacs.d mbsyncrc authinfo \
 	config/qutebrowser config/nvim/init.vim ideavimrc \
 	config/khal config/vdirsyncer/config config/khard \
-	config/rofi-pass gdbinit \
+	config/rofi-pass gdbinit notmuch-config \
 	$(wildcard sbt/0.13/*.sbt sbt/0.13/plugins/*.sbt)
 
 .PHONY: install clean check
diff --git a/config/khard/khard.conf b/config/khard/khard.conf
index 49d63b9..1978457 100644
--- a/config/khard/khard.conf
+++ b/config/khard/khard.conf
@@ -13,3 +13,4 @@ reverse = no
 show_nicknames = no
 show_uids = yes
 sort = last_name
+display = first_name
diff --git a/neomuttrc b/neomuttrc
new file mode 100644
index 0000000..4cc8a6e
--- /dev/null
+++ b/neomuttrc
@@ -0,0 +1,41 @@
+# vim:ft=muttrc:
+
+source ~/etc/muttrc_colors.angdraug
+
+set sleep_time=0    # disable "Mailbox is unchanged" message
+set confirmappend=no   # disable save to mailbox confirmation
+set delete=yes         # disable purge messages confirmation
+
+set sort=threads
+set nm_query_type=threads
+
+set folder=~/Maildir
+set spoolfile="="
+set record="=sent"
+set postponed="=drafts"
+set trash="=trash"
+# set virtual_spoolfile=yes
+
+virtual-mailboxes "inbox" "notmuch://?query=tag:inbox"
+virtual-mailboxes "archive" "notmuch://?query=tag:archive"
+virtual-mailboxes "sent" "notmuch://?query=tag:sent"
+
+bind index,pager X change-vfolder
+bind index,pager + entire-thread
+bind index,pager \` modify-labels
+bind index,pager \\ vfolder-from-query
+
+macro index,pager G "!/home/gebner/etc/sync_mail.sh\n"
+
+set query_command="khard email --parsable %s"
+bind editor <Tab> complete-query
+bind editor ^T    complete
+
+set edit_headers=yes
+set use_envelope_from=yes
+
+set sendmail="msmtp"
+
+set realname="Gabriel Ebner"
+alternates gebner@gebner.org gebner@2b7e.org ge@gabrielebner.at gabriel.ebner@tuwien.ac.at
+set reverse_name
diff --git a/notmuch-config b/notmuch-config
new file mode 100644
index 0000000..3f62270
--- /dev/null
+++ b/notmuch-config
@@ -0,0 +1,98 @@
+# .notmuch-config - Configuration file for the notmuch mail system
+#
+# For more information about notmuch, see http://notmuchmail.org
+
+# Database configuration
+#
+# The only value supported here is 'path' which should be the top-level
+# directory where your mail currently exists and to where mail will be
+# delivered in the future. Files should be individual email messages.
+# Notmuch will store its database within a sub-directory of the path
+# configured here named ".notmuch".
+#
+[database]
+path=/home/gebner/Maildir
+
+# User configuration
+#
+# Here is where you can let notmuch know how you would like to be
+# addressed. Valid settings are
+#
+#	name		Your full name.
+#	primary_email	Your primary email address.
+#	other_email	A list (separated by ';') of other email addresses
+#			at which you receive email.
+#
+# Notmuch will use the various email addresses configured here when
+# formatting replies. It will avoid including your own addresses in the
+# recipient list of replies, and will set the From address based on the
+# address to which the original email was addressed.
+#
+[user]
+name=Gabriel Ebner
+primary_email=gebner@gebner.org
+other_email=gabriel.ebner@tuwien.ac.at;ge@gabrielebner.at;gebner@2b7e.org;2b7e15@gmail.com;
+
+# Configuration for "notmuch new"
+#
+# The following options are supported here:
+#
+#	tags	A list (separated by ';') of the tags that will be
+#		added to all messages incorporated by "notmuch new".
+#
+#	ignore	A list (separated by ';') of file and directory names
+#		that will not be searched for messages by "notmuch new".
+#
+#		NOTE: *Every* file/directory that goes by one of those
+#		names will be ignored, independent of its depth/location
+#		in the mail store.
+#
+[new]
+tags=inbox
+ignore=spam
+
+# Search configuration
+#
+# The following option is supported here:
+#
+#	exclude_tags
+#		A ;-separated list of tags that will be excluded from
+#		search results by default.  Using an excluded tag in a
+#		query will override that exclusion.
+#
+[search]
+exclude_tags=deleted;spam;
+
+# Maildir compatibility configuration
+#
+# The following option is supported here:
+#
+#	synchronize_flags      Valid values are true and false.
+#
+#	If true, then the following maildir flags (in message filenames)
+#	will be synchronized with the corresponding notmuch tags:
+#
+#		Flag	Tag
+#		----	-------
+#		D	draft
+#		F	flagged
+#		P	passed
+#		R	replied
+#		S	unread (added when 'S' flag is not present)
+#
+#	The "notmuch new" command will notice flag changes in filenames
+#	and update tags, while the "notmuch tag" and "notmuch restore"
+#	commands will notice tag changes and update flags in filenames
+#
+[maildir]
+synchronize_flags=true
+
+# Cryptography related configuration
+#
+# The following option is supported here:
+#
+#	gpg_path
+#		binary name or full path to invoke gpg.
+#
+[crypto]
+gpg_path=/nix/store/sgh3qa1c3r3zvhabbsiv6gqydbpi7bfk-gnupg-2.0.29/bin/gpg2
diff --git a/sync_mail.sh b/sync_mail.sh
new file mode 100755
index 0000000..01c20ea
--- /dev/null
+++ b/sync_mail.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# afew -ma
+mbsync -a
+notmuch new
+# afew -tn