wip/enigmail/patches
