Merge pull request #563 from JohnMai/anthonylim

Fix clicking for conversations broken my prev commit