Switched MailAccount.pm to the object manager.