Mail refactor + fix for Investor selected guard