Added more email flexibility to allow usage of any SMTP server