added rich text / html support