Using new view that is safe for investors
Merge branch 'investorMail' into testing