diff --git a/src/components/card/CommentForm.vue b/src/components/card/CommentForm.vue
new file mode 100644
index 000000000..fdc56c753
--- /dev/null
+++ b/src/components/card/CommentForm.vue
@@ -0,0 +1,190 @@
+<!--
+  - @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
+  -
+  - @author Julius Härtl <jus@bitgrid.net>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<div class="comment-form">
+		<form @submit.prevent="submit">
+			<At ref="at"
+				v-model="commentText"
+				:members="members"
+				name-key="primaryKey"
+				:tab-select="true">
+				<template v-slot:item="s">
+					<Avatar class="atwho-li--avatar" :user="s.item.uid" :size="24" />
+					<span class="atwho-li--name" v-text="s.item.displayname" />
+				</template>
+				<template v-slot:embeddedItem="scope">
+					<span>
+						<UserBubble v-if="scope.current.primaryKey"
+							:data-mention-id="scope.current.primaryKey"
+							:user="scope.current.primaryKey"
+							:display-name="scope.current.displayname" />
+					</span>
+				</template>
+				<div ref="contentEditable"
+					contenteditable
+					@keydown.enter="handleKeydown"
+					@paste="onPaste"
+					@blur="error = null"
+					@input="validate" />
+			</At>
+			<input v-tooltip="t('deck', 'Save')"
+				class="icon-confirm"
+				type="submit"
+				value=""
+				:disabled="commentText.length === null || error">
+			<slot />
+		</form>
+		<p v-if="error">
+			{{ error }}
+		</p>
+	</div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import { UserBubble, Avatar } from '@nextcloud/vue'
+import At from 'vue-at'
+import { rawToParsed } from '../../helpers/mentions'
+
+export default {
+	name: 'CommentForm',
+	components: {
+		At,
+		Avatar,
+		UserBubble,
+	},
+	props: {
+		value: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			commentText: this.value,
+			error: null,
+		}
+	},
+	computed: {
+		...mapState({
+			currentBoard: state => state.currentBoard,
+		}),
+		members() {
+			return this.currentBoard.users
+		},
+	},
+	watch: {
+		value(val) {
+			this.commentText = val
+		},
+	},
+	methods: {
+		validate() {
+			this.error = null
+			const content = this.contentEditableToParsed()
+			if (content.length === 0) {
+				this.error = t('deck', 'The comment cannot be empty.')
+			}
+			if (content.length > 1000) {
+				this.error = t('deck', 'The comment cannot be longer than 1000 characters.')
+			}
+			return this.error === null ? content : null
+		},
+		submit() {
+			const content = this.validate()
+			if (content) {
+				this.$emit('input', content)
+				this.$emit('submit', content)
+			}
+		},
+		/**
+		 * All credits for this go to the talk app
+		 * https://github.com/nextcloud/spreed/blob/e69740b372e17eec4541337b47baa262a5766510/src/components/NewMessageForm/NewMessageForm.vue#L100-L143
+		 */
+		contentEditableToParsed() {
+			if (!this.$refs.contentEditable) {
+				return
+			}
+			const mentions = this.$refs.contentEditable.querySelectorAll('span[data-at-embedded]')
+			mentions.forEach(mention => {
+				// FIXME Adding a space after the mention should be improved to
+				// do it or not based on the next element instead of always
+				// adding it.
+				mention.replaceWith(' @' + mention.firstElementChild.attributes['data-mention-id'].value + ' ')
+			})
+
+			return rawToParsed(this.$refs.contentEditable.innerHTML)
+		},
+
+		/**
+		 * Emits the submit event when enter is pressed (look
+		 * at the v-on in the template) unless shift is pressed:
+		 * in this case a new line will be created.
+		 *
+		 * @param {object} event the event object;
+		 */
+		handleKeydown(event) {
+			// Prevent submit event when vue-at panel is open, as that should
+			// just select the mention from the panel.
+			if (this.atwho) {
+				return
+			}
+
+			// TODO: add support for CTRL+ENTER new line
+			if (!(event.shiftKey)) {
+				event.preventDefault()
+				this.submit()
+			}
+		},
+
+		onPaste(e) {
+			e.preventDefault()
+			const text = e.clipboardData.getData('text/plain')
+			document.execCommand('insertText', false, text)
+		},
+	},
+}
+</script>
+
+<style scoped lang="scss">
+	@import "../../css/comments";
+
+	.atwho-wrap {
+		width: 100%;
+		& > div[contenteditable] {
+			width: 100%;
+
+			&::v-deep > span > div {
+				vertical-align: middle;
+			}
+		}
+	}
+
+	.comment-form::v-deep .atwho-li {
+		height: 32px;
+	}
+
+	.atwho-li--avatar {
+		margin-right: 10px;
+	}
+</style>