#603 Fix some issues with emoticons
#605 Enable the WYSIWYG editor where required