diff --git a/.gitignore b/.gitignore
index eb661fd6a..884ce422e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ cypress.env.json
 
 !.gitkeep
 **/coverage
+
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 856410320..d8f63526f 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -11,7 +11,6 @@
   </div>
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
     <ds-card>
-      <ds-space margin-bottom="small" />
       <ds-space margin-bottom="small">
         <hc-user :user="author" :date-time="comment.createdAt" />
       </ds-space>
@@ -28,13 +27,27 @@
       </no-ssr>
       <!-- eslint-disable vue/no-v-html -->
       <!-- TODO: replace editor content with tiptap render view -->
+
+      <div v-if="isCollapsed" v-html="comment.contentExcerpt" style="padding-left: 40px;" />
+      <div
+        v-show="comment.content !== comment.contentExcerpt"
+        style="text-align: right;  margin-right: 20px; margin-top: -12px;"
+      >
+        <a v-if="isCollapsed" style="padding-left: 40px;" @click="isCollapsed = !isCollapsed">
+          {{ $t('comment.show.more') }}
+        </a>
+      </div>
+      <div v-if="!isCollapsed" v-html="comment.content" style="padding-left: 40px;" />
+      <div style="text-align: right;  margin-right: 20px; margin-top: -12px;">
+        <a v-if="!isCollapsed" @click="isCollapsed = !isCollapsed" style="padding-left: 40px; ">
+          {{ $t('comment.show.less') }}
+        </a>
+      </div>
       <ds-space margin-bottom="small" />
-      <div style="padding-left: 40px;" v-html="comment.contentExcerpt" />
-      <!-- eslint-enable vue/no-v-html -->
-      <ds-space margin-bottom="x-small" />
     </ds-card>
   </div>
 </template>
+<!-- eslint-enable vue/no-v-html -->
 
 <script>
 import gql from 'graphql-tag'
@@ -43,6 +56,11 @@ import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
 
 export default {
+  data: function() {
+    return {
+      isCollapsed: true,
+    }
+  },
   components: {
     HcUser,
     ContentMenu,
diff --git a/webapp/graphql/CommentMutations.js b/webapp/graphql/CommentMutations.js
index f94ea7ac9..e47e25d6a 100644
--- a/webapp/graphql/CommentMutations.js
+++ b/webapp/graphql/CommentMutations.js
@@ -7,6 +7,7 @@ export default () => {
         CreateComment(postId: $postId, content: $content) {
           id
           contentExcerpt
+          content
           author {
             id
             slug
diff --git a/webapp/graphql/PostCommentsQuery.js b/webapp/graphql/PostCommentsQuery.js
index 054c61fb9..bbdfa1178 100644
--- a/webapp/graphql/PostCommentsQuery.js
+++ b/webapp/graphql/PostCommentsQuery.js
@@ -8,6 +8,7 @@ export default i18n => {
         comments(orderBy: createdAt_asc) {
           id
           contentExcerpt
+          content
           createdAt
           disabled
           deleted
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 4e9e51750..430402c84 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -190,6 +190,10 @@
     "menu": {
       "edit": "Kommentar bearbeiten",
       "delete": "Kommentar löschen"
+    },
+    "show": {
+      "more": "mehr anzeigen",
+      "less": "weniger anzeigen"
     }
   },
   "quotes": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 063fea8ce..398226fa2 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -190,7 +190,12 @@
     "menu": {
       "edit": "Edit Comment",
       "delete": "Delete Comment"
+    },
+    "show": {
+      "more": "show more",
+      "less": "show less"
     }
+
   },
   "quotes": {
     "african": {