enable HTML if WYSIWYG editor option is on
Merge pull request #1019 from trob/master25

enable HTML if WYSIWYG editor option is on