More MSASEMAIL progress + refactoring