lergo-338-email-fix