davrieb's modifications to notmuch