Revamp SMTP mail stuff