Email view model cleanup, bug fixes