Added minor changes for MailManager