smtp not suitable for now, so it should be sendmail
Merge branch 'master' into production