diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js
index 3e2cdbe2f..3246e0256 100644
--- a/openslides/motions/static/js/motions/base.js
+++ b/openslides/motions/static/js/motions/base.js
@@ -444,7 +444,8 @@ angular.module('OpenSlidesApp.motions', [
 .factory('MotionComment', [
     'Config',
     'operator',
-    function (Config, operator) {
+    'Editor',
+    function (Config, operator, Editor) {
         return {
             getFormFields: function () {
                 var fields = Config.get('motions_comments').value;
@@ -453,10 +454,13 @@ angular.module('OpenSlidesApp.motions', [
                     function (field) {
                         return {
                             key: 'comment ' + field.name,
-                            type: 'input',
+                            type: 'editor',
                             templateOptions: {
                                 label: field.name,
                             },
+                            data: {
+                                tinymceOption: Editor.getOptions()
+                            },
                             hide: !operator.hasPerms("motions.can_see_and_manage_comments")
                         };
                     }
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index 7064a0a8f..4ba4a5264 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -407,11 +407,12 @@
 <div class="details" ng-if="isAllowedToSeeCommentField()">
   <h3>Motion Comments</h3>
   <div ng-repeat="field in commentsFields">
-    <p ng-if="field.public || operator.hasPerms('motions.can_see_and_manage_comments')">
-      <b>{{ field.name }}:</b>
-      <span ng-if="!field.public" class="label label-warning" translate>internal</span>
-      <br>
-      {{ motion.comments[$index] }}
-    </p>
+    <div ng-if="field.public || operator.hasPerms('motions.can_see_and_manage_comments')">
+      <h4>
+        {{ field.name }}
+        <span ng-if="!field.public" class="label label-warning" translate>internal</span>
+      </h4>
+      <div ng-bind-html="motion.comments[$index]"></div>
+    </div>
   </div>
 </div>