diff --git a/CHANGES.txt b/CHANGES.txt
index 9fbd808..1b4f0dc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,9 @@ Changelog
   instances of TinyMCE on a single page.
   [timo]
 
+- text/html added to the possible mime types for comments.
+  [timo]
+
 
 2.1.8 (unreleased)
 ------------------
diff --git a/plone/app/discussion/vocabularies.py b/plone/app/discussion/vocabularies.py
index ee1ad28..78f50ff 100644
--- a/plone/app/discussion/vocabularies.py
+++ b/plone/app/discussion/vocabularies.py
@@ -82,6 +82,11 @@ def text_transform_vocabulary(context):
             value='text/plain',
             token='text/plain',
             title='Plain text'))
+    terms.append(
+        SimpleTerm(
+            value='text/html',
+            token='text/html',
+            title='HTML'))
     terms.append(
         SimpleTerm(
             value='text/x-web-markdown',