diff --git a/src/components/card/CommentForm.vue b/src/components/card/CommentForm.vue
index 788dc4ece..f9fd85f71 100644
--- a/src/components/card/CommentForm.vue
+++ b/src/components/card/CommentForm.vue
@@ -167,7 +167,10 @@ export default {
 
 	.comment-form__contenteditable {
 		word-break: break-word;
-		border-radius: var(--border-radius-large)
+		border-radius: var(--border-radius-large);
+		padding: var(--default-grid-baseline);
+		max-height: 200px;
+		overflow: auto;
 	}
 
 	.atwho-wrap {
diff --git a/src/components/card/CommentItem.vue b/src/components/card/CommentItem.vue
index 97cabe28c..e7b05a8cc 100644
--- a/src/components/card/CommentItem.vue
+++ b/src/components/card/CommentItem.vue
@@ -18,6 +18,7 @@
 			</div>
 			<NcRichText class="comment--content"
 				dir="auto"
+				use-markdown
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
@@ -63,6 +64,7 @@
 		<div v-show="!edit" ref="richTextElement">
 			<NcRichText class="comment--content"
 				dir="auto"
+				use-markdown
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
diff --git a/src/css/comments.scss b/src/css/comments.scss
index a44c17636..e760ff37c 100644
--- a/src/css/comments.scss
+++ b/src/css/comments.scss
@@ -23,10 +23,13 @@
 		padding: 13px;
 		background-color: transparent;
 		border: none;
-		opacity: .3;
 		position: absolute;
-		bottom: 0;
-		right: 0;
+		bottom: var(--default-grid-baseline);
+		right: var(--default-grid-baseline);
+
+		&:disabled {
+			opacity: .7;
+		}
 	}
 }