diff --git a/package-lock.json b/package-lock.json
index 03b296fd1..04121d9b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3461,6 +3461,14 @@
 				}
 			}
 		},
+		"@juliushaertl/vue-richtext": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-0.1.3.tgz",
+			"integrity": "sha512-E+YO3qLaALX7+Jgk08jQIcmV8LQBPZBO22pVHhTJOuSSYy/uSn6I5r9y4U9pdGLDQRIMhIiGNfNq5TgZuxDYoQ==",
+			"requires": {
+				"vue": "^2.6.11"
+			}
+		},
 		"@nextcloud/auth": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.2.1.tgz",
diff --git a/package.json b/package.json
index 41e5936c7..13816e9e6 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
 	"dependencies": {
 		"@babel/polyfill": "^7.8.3",
 		"@babel/runtime": "^7.8.3",
+		"@juliushaertl/vue-richtext": "^0.1.3",
 		"@nextcloud/auth": "^1.2.1",
 		"@nextcloud/axios": "^1.3.1",
 		"@nextcloud/l10n": "^1.0.1",
diff --git a/src/components/card/CommentItem.vue b/src/components/card/CommentItem.vue
index 4b8f5922d..273b0ac91 100644
--- a/src/components/card/CommentItem.vue
+++ b/src/components/card/CommentItem.vue
@@ -15,8 +15,7 @@
 					</ActionButton>
 				</Actions>
 			</div>
-			<!-- FIXME: Check if input is sanitized -->
-			<p class="comment--content" v-html="parsedMessage" /><p />
+			<RichText :text="richText" :arguments="richArgs" />
 		</template>
 		<form v-else @submit.prevent="updateComment">
 			<input v-model="commentMsg"
@@ -36,8 +35,9 @@
 </template>
 
 <script>
-import { Avatar, Actions, ActionButton } from '@nextcloud/vue'
+import { Avatar, Actions, ActionButton, UserBubble } from '@nextcloud/vue'
 import escapeHtml from 'escape-html'
+import RichText from '@juliushaertl/vue-richtext'
 
 export default {
 	name: 'CommentItem',
@@ -45,6 +45,7 @@ export default {
 		Avatar,
 		Actions,
 		ActionButton,
+		RichText,
 	},
 	props: {
 		comment: {
@@ -60,17 +61,33 @@ export default {
 	},
 
 	computed: {
+		richText() {
+			let message = this.parsedMessage
+			this.comment.mentions.forEach((mention, index) => {
+				message = message.replace('@' + mention.mentionId + '', `{user${index}}`)
+			})
+			return message
+		},
+		richArgs() {
+			const mentions = [...this.comment.mentions]
+			// TODO mentions are set once per user, so when mentioning the same user multiple times this doesn't work
+			const result = mentions.reduce(function(result, item, index) {
+				const itemKey = 'user' + index
+				result[itemKey] = {
+					component: UserBubble,
+					props: {
+						user: item.mentionId,
+						displayName: item.mentionDisplayName,
+					},
+				}
+				return result
+			}, {})
+			return result
+		},
 		parsedMessage() {
 			const div = document.createElement('div')
 			div.innerHTML = this.comment.message
-			let message = escapeHtml(div.textContent || div.innerText || '')
-			// FIXME: We need a proper way to show user bubbles in the comment content
-			// Either we split the text and render components for each part or we could try
-			// to manually mount a component into the current components dom
-			this.comment.mentions.forEach((mention) => {
-				message = message.replace('@' + mention.mentionId + ' ', '<strong data-mention-id="' + mention.mentionId + '">@' + mention.mentionDisplayName + '</strong> ')
-			})
-			return message
+			return escapeHtml(div.textContent || div.innerText || '')
 		},
 	},