Updated smtpClient support