Merge branch 'master' into raysmond
update message view
Merge branch 'raysmond'