refactor One to One chat // finished