diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index e54919cbd..fbf8ed9d6 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -39,18 +39,27 @@
         />
       </div>
       <div v-show="!openEditCommentMenu">
-        <div v-if="isCollapsed" v-html="comment.contentExcerpt" style="padding-left: 40px;" />
+        <content-viewer
+          v-if="comment.content.length < 180"
+          :content="comment.content"
+          class="padding-left"
+        />
         <div
           v-show="comment.content !== comment.contentExcerpt && comment.content.length > 180"
           style="text-align: right;  margin-right: 20px; margin-top: -12px;"
         >
+          <content-viewer
+            v-if="isCollapsed"
+            :content="comment.contentExcerpt"
+            class="padding-left"
+          />
           <span class="show-more-or-less">
             <a v-if="isCollapsed" class="padding-left" @click="isCollapsed = !isCollapsed">
               {{ $t('comment.show.more') }}
             </a>
           </span>
         </div>
-        <content-viewer v-if="!isCollapsed" v-html="comment.content" class="padding-left" />
+        <content-viewer v-if="!isCollapsed" :content="comment.content" class="padding-left" />
         <div style="text-align: right;  margin-right: 20px; margin-top: -12px;">
           <span class="show-more-or-less">
             <a v-if="!isCollapsed" @click="isCollapsed = !isCollapsed" class="padding-left">