Added some SMTP timeout stuff