diff --git a/mail/.config/aerc/aerc.conf b/mail/.config/aerc/aerc.conf
index d83831c..d7effe8 100644
--- a/mail/.config/aerc/aerc.conf
+++ b/mail/.config/aerc/aerc.conf
@@ -140,7 +140,7 @@ header-layout=To|From,Subject,Cc|Bcc
 # the first field. Only the email address field is required. The second field,
 # if present, will be treated as the contact name. Additional fields are
 # ignored.
-address-book-cmd=
+address-book-cmd=mail-searchcontacts %s
 
 [filters]
 #
diff --git a/mail/.config/aerc/binds.conf b/mail/.config/aerc/binds.conf
index 122aba4..e39cf31 100644
--- a/mail/.config/aerc/binds.conf
+++ b/mail/.config/aerc/binds.conf
@@ -4,7 +4,7 @@
 gT = :prev-tab<Enter>
 gt = :next-tab<Enter>
 <C-t> = :term<Enter>
-gR = :exec checkmail<Enter>
+gR = :exec mail-check<Enter>
 
 [messages]
 q = :quit<Enter>
diff --git a/mail/.local/bin/checkmail b/mail/.local/bin/mail-check
similarity index 79%
rename from mail/.local/bin/checkmail
rename to mail/.local/bin/mail-check
index 27ae526..fc90d16 100755
--- a/mail/.local/bin/checkmail
+++ b/mail/.local/bin/mail-check
@@ -13,7 +13,7 @@
 
 MBSYNC_MAX_TRIES=3
 MBSYNC_PRE="imapfilter -c /home/marty/.config/imapfilter/config.lua"
-MBSYNC_POST="notmuch new"
+MBSYNC_POST="notmuch new && afew --tag --new"
 
 # fail the routine and optionally send a message why
 fail() {
@@ -59,4 +59,11 @@ main() {
   $MBSYNC_POST
 }
 
+notmuch_foldertags() {
+  notmuch tag +dump -inbox -deleted -- folder:Dump and not folder:Inbox
+  notmuch tag +archived -inbox -deleted -- folder:Archive and not folder:Inbox
+  notmuch tag +deleted -inbox -archived -- folder:Trash and not folder:Inbox
+}
+
 main
+notmuch_foldertags
diff --git a/mail/.local/bin/mail-searchcontacts b/mail/.local/bin/mail-searchcontacts
new file mode 100755
index 0000000..65c1f3c
--- /dev/null
+++ b/mail/.local/bin/mail-searchcontacts
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+# gets known e-mail adresses out of the current notmuch database
+#
+# called like `mail-searchcontacts [myadress]`
+#
+# where myaddress can be anything that connects mails to their adresses:
+# if directly found in the 'from': field, it will return those adresses
+# if no results are returned, it will switch to a more fuzzy search mode
+# looking through subjects, mail text, and so on for the keywords
+#
+# this can be somewhat slow for large mailboxes, in which case you probably
+# want to turn off fuzzy matching
+
+searchterm="$1"
+
+# make search fuzzy if 'fuzzy' is the second arg
+searchcmd() {
+  if [ -n "$1" ] && [ "$2" = "fuzzy" ]; then
+    term="and $1"
+  elif [ -n "$1" ]; then
+    term="and from:$1"
+  else
+    term=""
+  fi
+  notmuch address --deduplicate=address --output=count not from:marty.oehme@gmail.com "$term" | sort --numeric-sort -r | cut -f2- | sed -e 's/\(^.*\)\(<.*$\)/\2\t\1/'
+}
+
+results=$(searchcmd "$searchterm")
+
+if [ -z "$results" ]; then
+  results=$(searchcmd "$searchterm" "fuzzy")
+fi
+
+echo "$results"