SMTP production hotfix