Polish conversation view
Merge pull request #4960 from Flaburgan/polish-conversation-view

Polish conversation view