Add smtpfix
Merge branch 'hotfix/stmpfix'