fixes conversation bug
Merge branch 'master' of ssh://github.com/fellan12/ChatClient