work on message history
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
more work on history view
change loading text