More notmuch filter corrections. Cleaning up decrypting for offlineimap