Moved MailBundle to new form system