Changes due to MailSender's modification..