Changed implementation of SMTP service.