wip/deforaos-mailer/patches
