patches to the notmuch mail indexer