Chat log and emoticons fixes
Merge pull request #1 from ecere/master

Chat log and emoticon fixes