added parts of SMTP app