Merge pull request #562 from shaitanelnifi/master

journal sound fix during convo
Fix clicking for conversations broken my prev commit
Merge pull request #563 from JohnMai/anthonylim

Fix clicking for conversations broken my prev commit