Changes for bulk email in SMTPSendEmailTask