Fixed /me messages in chat room history
Merge branch 'master' into filetransfer