working after chat window list refactoring