Fixed messages for new rooms
Merge branch 'master' into plugins