Fixed email messages and smtp code