Added MailStorage class