Fixes to SMTP notifications