modified EmailSender