Colour /me messages correctly

fixes #457
Merge branch 'master' into filetransfer