update user message display
Merge remote-tracking branch 'Git_LM/master' into master1