Little Chage for EmailSender