Fix wrong user icon for new messages bug
Merge remote-tracking branch 'origin/master'