Update MailSystem to beta2