Highlight active rooms in bookmark list
Merge branch 'master' into gmail