diff --git a/package.json b/package.json
index f295b1f4..feba190b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,9 @@
     "camel-case": "4.1.1",
     "copy-to-clipboard": "3.3.1",
     "date-fns": "2.14.0",
+    "dompurify": "^2.0.12",
     "lodash": "4.17.19",
+    "marked": "^1.1.0",
     "register-service-worker": "1.7.1",
     "snake-case": "3.0.3",
     "v-tooltip": "2.0.3",
diff --git a/src/components/input/easymde.vue b/src/components/input/easymde.vue
deleted file mode 100644
index 5b95cfb3..00000000
--- a/src/components/input/easymde.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-    <!-- TODO: Fix the icons -->
-    <vue-easymde v-model="text" :configs="config" @change="bubble"/>
-</template>
-
-<script>
-    import VueEasymde from 'vue-easymde'
-
-    export default {
-        name: 'easymde',
-        components: {
-            VueEasymde
-        },
-        props: {
-            value: {
-                type: String,
-                default: '',
-            },
-        },
-        data() {
-            return {
-                text: '',
-                config: {
-                    autoDownloadFontAwesome: false,
-                    spellChecker: false,
-                    placeholder: 'Click here to enter a description...',
-                    toolbar: [
-                        'heading-1',
-                        'heading-2',
-                        'heading-3',
-                        'heading-smaller',
-                        'heading-bigger',
-                        '|',
-                        'bold',
-                        'italic',
-                        'strikethrough',
-                        'code',
-                        'quote',
-                        'unordered-list',
-                        'ordered-list',
-                        '|',
-                        'clean-block',
-                        'link',
-                        'image',
-                        'table',
-                        'horizontal-rule',
-                        '|',
-                        'preview',
-                        'side-by-side',
-                        'fullscreen',
-                        'guide',
-//                        {
-//                            name: 'bold',
-//                            title: 'Bold',
-//                            iconElement: '<span>test</span>' // This relies on an extra thing added in node_modules/easymde/src/js/easymde.js:145
-//                        },
-                    ]
-                },
-            }
-        },
-        watch: {
-            value(newVal) {
-                this.text = newVal
-            },
-            text() {
-                this.bubble()
-            }
-        },
-        methods: {
-            bubble() {
-                this.$emit('input', this.text)
-                this.$emit('change')
-            }
-        },
-    }
-</script>
-
-<style lang="scss">
-    @import '../../../node_modules/easymde/dist/easymde.min.css';
-
-    .CodeMirror {
-        padding: 0;
-    }
-
-    .CodeMirror-scroll {
-        padding: .5em;
-    }
-
-    .editor-toolbar {
-        background: #ffffff;
-    }
-
-    pre.CodeMirror-line{
-        margin-bottom: 0 !important;
-    }
-</style>
diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
new file mode 100644
index 00000000..11c17d16
--- /dev/null
+++ b/src/components/input/editor.vue
@@ -0,0 +1,415 @@
+<template>
+	<div class="editor">
+		<div class="tabs is-right" v-if="hasPreview">
+			<ul>
+				<li :class="{'is-active': isPreviewActive}" v-if="isEditActive">
+					<a @click="showPreview">Preview</a>
+				</li>
+				<li :class="{'is-active': isEditActive}">
+					<a @click="() => {isPreviewActive = false; isEditActive = true}">Edit</a>
+				</li>
+			</ul>
+		</div>
+
+		<vue-easymde v-model="text" :configs="config" @change="bubble" class="content" v-if="isEditActive"/>
+
+		<div class="preview content" v-if="isPreviewActive" v-html="preview">
+		</div>
+	</div>
+</template>
+
+<script>
+	import VueEasymde from 'vue-easymde'
+	import EasyMDE from 'easymde'
+	import marked from 'marked'
+	import DOMPurify from 'dompurify'
+
+	import AttachmentModel from '../../models/attachment'
+	import AttachmentService from '../../services/attachment'
+
+	export default {
+		name: 'editor',
+		components: {
+			VueEasymde
+		},
+		props: {
+			value: {
+				type: String,
+				default: '',
+			},
+			placeholder: {
+				type: String,
+				default: '',
+			},
+			uploadEnabled: {
+				type: Boolean,
+				default() {
+					return false
+				},
+			},
+			uploadCallback: {
+				type: Function,
+			},
+			hasPreview: {
+				type: Boolean,
+				default: true,
+			},
+			previewIsDefault: {
+				type: Boolean,
+				default: true,
+			},
+		},
+		data() {
+			return {
+				text: '',
+				changeTimeout: null,
+				isEditActive: false,
+				isPreviewActive: true,
+
+				preview: '',
+				attachmentService: null,
+
+				config: {
+					autoDownloadFontAwesome: false,
+					spellChecker: false,
+					placeholder: this.placeholder,
+					uploadImage: this.uploadEnabled,
+					imageUploadFunction: this.uploadCallback,
+					minHeight: '150px',
+					toolbar: [
+						{
+							name: 'heading-1',
+							action: EasyMDE.toggleHeading1,
+							title: 'Heading 1',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+						},
+						{
+							name: 'heading-2',
+							action: EasyMDE.toggleHeading2,
+							title: 'Heading 2',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+						},
+						{
+							name: 'heading-3',
+							action: EasyMDE.toggleHeading3,
+							title: 'Heading 3',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+						},
+						{
+							name: 'heading-smaller',
+							action: EasyMDE.toggleHeadingSmaller,
+							title: 'Heading Smaller',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+						},
+						{
+							name: 'heading-bigger',
+							action: EasyMDE.toggleHeadingBigger,
+							title: 'Heading Bigger',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+						},
+						'|',
+						{
+							name: 'bold',
+							action: EasyMDE.toggleBold,
+							title: 'Bold',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 3H6.5H15.25C18.15 3 20.5 5.36 20.5 8.25C20.5 9.8 19.81 11.19 18.73 12.15C20.37 13.04 21.5 14.76 21.5 16.75C21.5 19.64 19.15 22 16.25 22H6.5H3.5C2.95 22 2.5 21.55 2.5 21C2.5 20.45 2.95 20 3.5 20H5.5V5H3.5C2.95 5 2.5 4.55 2.5 4C2.5 3.45 2.95 3 3.5 3ZM7.5 20H16.25C18.04 20 19.5 18.54 19.5 16.75C19.5 14.96 18.04 13.5 16.25 13.5H7.5V20ZM7.5 11.5H15.25C17.04 11.5 18.5 10.04 18.5 8.25C18.5 6.46 17.04 5 15.25 5H7.5V11.5Z"/></svg>',
+						},
+						{
+							name: 'italic',
+							action: EasyMDE.toggleItalic,
+							title: 'Italic',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14.0967 4.2H17.0001C17.3301 4.2 17.6001 3.93 17.6001 3.6C17.6001 3.27 17.3301 3 17.0001 3H10.2001C9.8701 3 9.6001 3.27 9.6001 3.6C9.6001 3.93 9.8701 4.2 10.2001 4.2H12.8748L9.90335 19.8H6.9999C6.6699 19.8 6.3999 20.07 6.3999 20.4C6.3999 20.73 6.6699 21 6.9999 21H13.7999C14.1299 21 14.3999 20.73 14.3999 20.4C14.3999 20.07 14.1299 19.8 13.7999 19.8H11.1253L14.0967 4.2Z"/></svg>',
+						},
+						{
+							name: 'strikethrough',
+							action: EasyMDE.toggleStrikethrough,
+							title: 'Strikethrough',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.25 7.17005C18.25 7.50005 17.98 7.77005 17.65 7.77005C17.32 7.77005 17.05 7.50005 17.05 7.17005V5.96005C15.97 5.12005 14.17 4.56005 12.79 4.31005C11.1 4.00005 9.51 4.30005 8.41 5.12005C7.2 6.03005 6.67 7.67005 7.19 8.88005C7.56 9.73005 8.37 10.31 8.98 10.64C9.57215 10.9644 10.1961 11.2013 10.8465 11.3999H20.4C20.73 11.3999 21 11.6699 21 11.9999C21 12.3299 20.73 12.5999 20.4 12.5999H15.3012C16.6583 13.0929 17.5255 13.7765 17.95 14.69C18.73 16.36 17.74 18.33 16.36 19.41C15.05 20.4401 13.35 21 11.54 21H11.16C9.78 20.9401 8.34 20.5301 6.95 19.85V20.3601C6.95 20.6901 6.68 20.96 6.35 20.96C6.02 20.96 5.75 20.6901 5.75 20.3601V17.36C5.75 17.03 6.02 16.76 6.35 16.76C6.68 16.76 6.95 17.03 6.95 17.36V18.5C8.35 19.2801 9.81 19.74 11.21 19.8C12.86 19.89 14.46 19.39 15.62 18.48C16.6 17.71 17.37 16.3 16.86 15.21C16.55 14.54 15.8 14.0201 14.58 13.63C13.9711 13.4331 13.3222 13.2762 12.6906 13.1235C12.6168 13.1056 12.5432 13.0878 12.47 13.07C12.4313 13.0607 12.3925 13.0514 12.3537 13.0421C11.7861 12.9055 11.2108 12.767 10.6413 12.5999H3.6C3.27 12.5999 3 12.3299 3 11.9999C3 11.6699 3.27 11.3999 3.6 11.3999H7.90288C7.04984 10.8343 6.42752 10.1363 6.09 9.36005C5.34 7.63005 6.03 5.40005 7.69 4.16005C9.05 3.15005 10.99 2.77005 13 3.13005C13.64 3.25005 15.53 3.66005 17.05 4.53005V4.17005C17.05 3.84005 17.32 3.57005 17.65 3.57005C17.98 3.57005 18.25 3.84005 18.25 4.17005V7.17005Z"/></svg>',
+						},
+						{
+							name: 'code',
+							action: EasyMDE.toggleCodeBlock,
+							title: 'Code',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.57 20.9601C8.64 20.9901 8.71 21.0001 8.78 21.0001C9.02 21.0001 9.24 20.8501 9.34 20.6101L15.79 3.81005C15.9 3.50005 15.75 3.15005 15.44 3.03005C15.14 2.92005 14.79 3.07005 14.67 3.38005L8.22 20.1801C8.11 20.4901 8.26 20.8401 8.57 20.9601ZM7.00007 18.0001C6.85007 18.0001 6.69007 17.9401 6.58007 17.8201L1.18007 12.4201C0.950068 12.1901 0.950068 11.8101 1.18007 11.5701L6.58007 6.17006C6.81007 5.94006 7.19007 5.94006 7.43007 6.17006C7.66007 6.40006 7.66007 6.78006 7.43007 7.02006L2.45007 12.0001L7.43007 16.9801C7.66007 17.2101 7.66007 17.5901 7.43007 17.8301C7.31007 17.9401 7.15007 18.0001 7.00007 18.0001ZM17 18.0001C16.85 18.0001 16.69 17.9401 16.58 17.8201C16.35 17.5901 16.35 17.2101 16.58 16.9701L21.55 12.0001L16.57 7.02006C16.34 6.79006 16.34 6.41006 16.57 6.17006C16.81 5.94006 17.19 5.94006 17.42 6.17006L22.82 11.5701C23.05 11.8001 23.05 12.1801 22.82 12.4201L17.42 17.8201C17.31 17.9401 17.15 18.0001 17 18.0001Z"/></svg>',
+						},
+						{
+							name: 'quote',
+							action: EasyMDE.toggleBlockquote,
+							title: 'Quote',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M19.373 5.16357H5.62695C4.79102 5.16357 4.11133 5.84326 4.11133 6.6792V16.2095C4.11133 17.0464 4.79102 17.7261 5.62695 17.7261H6.8877V21.1245C6.8877 21.3667 7.0332 21.5854 7.25684 21.6782C7.33203 21.7095 7.41016 21.7241 7.4873 21.7241C7.64258 21.7241 7.7959 21.6636 7.91113 21.5493L11.748 17.7261H19.373C20.209 17.7261 20.8887 17.0464 20.8887 16.2095V6.6792C20.8887 5.84326 20.209 5.16357 19.373 5.16357ZM19.6895 16.2095C19.6895 16.3843 19.5469 16.5269 19.373 16.5269H11.5C11.3408 16.5269 11.1895 16.5894 11.0762 16.7017L8.08691 19.6802V17.1265C8.08691 16.7954 7.81836 16.5269 7.4873 16.5269H5.62695C5.45312 16.5269 5.31055 16.3843 5.31055 16.2095V6.6792C5.31055 6.50537 5.45312 6.36279 5.62695 6.36279H19.373C19.5469 6.36279 19.6895 6.50537 19.6895 6.6792V16.2095ZM10.3431 8.45264C9.46326 8.45264 8.75 9.16589 8.75 10.0458C8.75 10.9257 9.46326 11.639 10.3431 11.639C10.4775 11.639 10.6058 11.6173 10.7305 11.5861V11.6195C10.7305 12.1322 10.3135 12.5492 9.75586 12.5492C9.4248 12.5492 9.17871 12.8177 9.17871 13.1488C9.17871 13.4799 9.46973 13.7484 9.80078 13.7484C10.9746 13.7484 11.9297 12.7933 11.9297 11.6195V10.1176L11.9294 10.1165L11.9292 10.1155C11.9297 10.1049 11.9312 10.0946 11.9326 10.0843L11.9326 10.0843C11.9345 10.0716 11.9363 10.059 11.9363 10.0458C11.9363 9.16589 11.223 8.45264 10.3431 8.45264ZM13.0637 10.0458C13.0637 9.16589 13.7771 8.45264 14.657 8.45264C15.5369 8.45264 16.2501 9.16589 16.2501 10.0458C16.2501 10.0584 16.2484 10.0706 16.2466 10.0828C16.2452 10.0929 16.2437 10.103 16.2433 10.1134C16.2433 10.1149 16.2441 10.1161 16.2441 10.1176V11.6195C16.2441 12.7933 15.2891 13.7484 14.1152 13.7484C13.7842 13.7484 13.4922 13.4799 13.4922 13.1488C13.4922 12.8177 13.7383 12.5492 14.0693 12.5492C14.6279 12.5492 15.0449 12.1322 15.0449 11.6195V11.5858C14.9202 11.6173 14.7915 11.639 14.657 11.639C13.7771 11.639 13.0637 10.9257 13.0637 10.0458Z"/></svg>',
+						},
+						{
+							name: 'unordered-list',
+							action: EasyMDE.toggleUnorderedList,
+							title: 'Unordered List',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.5281 3.7002H3.5281C3.1981 3.7002 2.9281 3.9702 2.9281 4.3002V7.3002C2.9281 7.6302 3.1981 7.9002 3.5281 7.9002H6.5281C6.8581 7.9002 7.1281 7.6302 7.1281 7.3002V4.3002C7.1281 3.9702 6.8581 3.7002 6.5281 3.7002ZM5.9281 6.7002H4.1281V4.9002H5.9281V6.7002ZM3.5281 9.90015H6.5281C6.8581 9.90015 7.1281 10.1701 7.1281 10.5001V13.5001C7.1281 13.8301 6.8581 14.1001 6.5281 14.1001H3.5281C3.1981 14.1001 2.9281 13.8301 2.9281 13.5001V10.5001C2.9281 10.1701 3.1981 9.90015 3.5281 9.90015ZM4.1281 12.9001H5.9281V11.1001H4.1281V12.9001ZM3.5281 16.1001H6.5281C6.8581 16.1001 7.1281 16.3701 7.1281 16.7001V19.7001C7.1281 20.0301 6.8581 20.3001 6.5281 20.3001H3.5281C3.1981 20.3001 2.9281 20.0301 2.9281 19.7001V16.7001C2.9281 16.3701 3.1981 16.1001 3.5281 16.1001ZM4.1281 19.1001H5.9281V17.3001H4.1281V19.1001ZM9.72817 6.4002H20.7282C21.0582 6.4002 21.3282 6.1302 21.3282 5.8002C21.3282 5.4702 21.0582 5.2002 20.7282 5.2002H9.72817C9.39817 5.2002 9.12817 5.4702 9.12817 5.8002C9.12817 6.1302 9.39817 6.4002 9.72817 6.4002ZM9.72817 11.4001H20.7282C21.0582 11.4001 21.3282 11.6701 21.3282 12.0001C21.3282 12.3301 21.0582 12.6001 20.7282 12.6001H9.72817C9.39817 12.6001 9.12817 12.3301 9.12817 12.0001C9.12817 11.6701 9.39817 11.4001 9.72817 11.4001ZM9.72817 17.6001H20.7282C21.0582 17.6001 21.3282 17.8701 21.3282 18.2001C21.3282 18.5301 21.0582 18.8001 20.7282 18.8001H9.72817C9.39817 18.8001 9.12817 18.5301 9.12817 18.2001C9.12817 17.8701 9.39817 17.6001 9.72817 17.6001Z"/></svg>',
+						},
+						{
+							name: 'ordered-list',
+							action: EasyMDE.toggleOrderedList,
+							title: 'Ordered List',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4.19494 8.29994H5.99494C6.26494 8.29994 6.49494 8.07995 6.49494 7.79994C6.49494 7.51995 6.27494 7.29994 5.99494 7.29994H5.59494V3.79994C5.59494 3.62994 5.50494 3.46994 5.36494 3.37994C5.22494 3.28994 5.04494 3.26994 4.89494 3.33994L3.89494 3.76994C3.64494 3.87994 3.52494 4.17994 3.63494 4.42994C3.74494 4.67994 4.03494 4.79994 4.29494 4.68994L4.59494 4.55994V7.29994H4.19494C3.91494 7.29994 3.69494 7.51995 3.69494 7.79994C3.69494 8.07995 3.91494 8.29994 4.19494 8.29994ZM20.195 6.39995H9.19497C8.86497 6.39995 8.59497 6.12995 8.59497 5.79995C8.59497 5.46995 8.86497 5.19995 9.19497 5.19995H20.195C20.525 5.19995 20.795 5.46995 20.795 5.79995C20.795 6.12995 20.525 6.39995 20.195 6.39995ZM3.78486 14.36H6.37486C6.65486 14.36 6.87486 14.14 6.87486 13.86C6.87486 13.58 6.65486 13.36 6.37486 13.36H4.88486C5.00486 13.23 5.12486 13.09 5.23486 12.95C5.26626 12.9151 5.29645 12.8802 5.32626 12.8458L5.32629 12.8457C5.38192 12.7814 5.43627 12.7186 5.49486 12.66C5.73486 12.4 5.98486 12.12 6.17486 11.79C6.47486 11.25 6.41486 10.63 6.01486 10.17C5.57486 9.66 4.86486 9.5 4.24486 9.74C3.74486 9.95 3.39486 10.35 3.22486 10.91C3.14486 11.18 3.29486 11.46 3.56486 11.54C3.82486 11.61 4.10486 11.46 4.18486 11.2C4.29486 10.85 4.48486 10.73 4.62486 10.67C4.88486 10.57 5.13486 10.68 5.26486 10.82C5.38486 10.96 5.40486 11.12 5.30486 11.29C5.17595 11.5202 4.99618 11.7165 4.80458 11.9257L4.75486 11.98C4.67298 12.0801 4.58283 12.1801 4.49946 12.2727L4.49945 12.2727L4.47486 12.3C4.12486 12.72 3.76486 13.13 3.40486 13.53C3.27486 13.68 3.23486 13.9 3.32486 14.07C3.41486 14.24 3.58486 14.36 3.78486 14.36ZM3.68486 20.3699C4.04486 20.5899 4.46486 20.6999 4.87486 20.6999C5.13486 20.6999 5.38486 20.6499 5.61486 20.5499C6.31486 20.2799 6.73486 19.5599 6.60486 18.8799C6.53486 18.5499 6.35486 18.2899 6.12486 18.0899C6.32486 17.8999 6.45486 17.6499 6.50486 17.3799C6.57486 17.0099 6.49486 16.6299 6.27486 16.3099C5.85486 15.6899 5.07486 15.5199 4.10486 15.8299C3.83486 15.9199 3.69486 16.1999 3.77486 16.4599C3.86486 16.7299 4.14486 16.8699 4.40486 16.7899C4.70486 16.6999 5.24486 16.5799 5.45486 16.8899C5.51486 16.9899 5.54486 17.0999 5.52486 17.1999C5.51486 17.2699 5.47486 17.3599 5.36486 17.4299C5.26486 17.4999 5.12486 17.5399 4.95486 17.5799L4.77486 17.6299C4.54486 17.6999 4.40486 17.9099 4.41486 18.1499C4.42486 18.3899 4.61486 18.5799 4.84486 18.6099C5.20486 18.6599 5.58486 18.8299 5.63486 19.0799C5.67486 19.2999 5.46486 19.5499 5.25486 19.6299C4.94486 19.7599 4.52486 19.7099 4.21486 19.5199C3.97486 19.3699 3.67486 19.4399 3.52486 19.6799C3.37486 19.9199 3.44486 20.2299 3.68486 20.3699ZM20.195 18.7999H9.19497C8.86497 18.7999 8.59497 18.5299 8.59497 18.1999C8.59497 17.8699 8.86497 17.5999 9.19497 17.5999H20.195C20.525 17.5999 20.795 17.8699 20.795 18.1999C20.795 18.5299 20.525 18.7999 20.195 18.7999ZM9.19497 12.5999H20.195C20.525 12.5999 20.795 12.3299 20.795 11.9999C20.795 11.6699 20.525 11.3999 20.195 11.3999H9.19497C8.86497 11.3999 8.59497 11.6699 8.59497 11.9999C8.59497 12.3299 8.86497 12.5999 9.19497 12.5999Z"/></svg>',
+						},
+						'|',
+						{
+							name: 'clean-block',
+							action: EasyMDE.cleanBlock,
+							title: 'Clean Block',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M9.25989 6.18384H20.4513C20.7823 6.18384 21.0509 6.45239 21.0509 6.78345V17.9749C21.0509 18.3059 20.7823 18.5745 20.4513 18.5745H9.25989C9.0929 18.5745 8.93469 18.5061 8.82043 18.384L3.6095 12.7883C3.39563 12.5579 3.39563 12.2004 3.6095 11.97L8.82043 6.37427C8.93469 6.2522 9.0929 6.18384 9.25989 6.18384ZM9.52063 17.3752H19.8517V7.38306H9.52063L4.86926 12.3792L9.52063 17.3752ZM12.7755 15.0686C12.6222 15.0686 12.4679 15.01 12.3517 14.8928C12.1173 14.6584 12.1173 14.2786 12.3517 14.0452L14.0503 12.3469L12.3517 10.6487C12.1173 10.4153 12.1173 10.0354 12.3517 9.80103C12.5841 9.56665 12.965 9.56665 13.1993 9.80103L14.8981 11.4994L16.5968 9.80103C16.8312 9.56665 17.212 9.56665 17.4445 9.80103C17.6788 10.0354 17.6788 10.4153 17.4445 10.6487L15.7458 12.3469L17.4445 14.0452C17.6788 14.2786 17.6788 14.6584 17.4445 14.8928C17.3282 15.01 17.174 15.0686 17.0206 15.0686C16.8673 15.0686 16.714 15.01 16.5968 14.8928L14.8981 13.1945L13.1993 14.8928C13.0822 15.01 12.9288 15.0686 12.7755 15.0686Z"/></svg>',
+						},
+						{
+							name: 'link',
+							action: EasyMDE.drawLink,
+							title: 'Link',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M11.4399 15.3452C11.4999 15.3652 11.5699 15.3752 11.6299 15.3752C11.8799 15.3752 12.1199 15.2152 12.1999 14.9652C12.2999 14.6452 12.1299 14.3052 11.8199 14.2052C11.3499 14.0452 10.9299 13.7852 10.5699 13.4152C10.1999 13.0552 9.9399 12.6452 9.7799 12.1552C9.6599 11.8252 9.5999 11.4652 9.5999 11.0952C9.5999 10.2152 9.9399 9.38518 10.5699 8.75518L15.1599 4.15518C16.4499 2.87518 18.5399 2.87518 19.8299 4.15518C20.4499 4.78518 20.7899 5.61518 20.7899 6.49518C20.7899 7.37518 20.4499 8.20518 19.8299 8.82518L16.7399 11.9052C16.5099 12.1452 16.5099 12.5252 16.7399 12.7552C16.9799 12.9852 17.3599 12.9852 17.5899 12.7552L20.6799 9.67518C21.5299 8.83518 21.9999 7.69518 21.9999 6.49518C21.9999 5.29518 21.5299 4.16518 20.6899 3.30518C18.9299 1.55518 16.0799 1.55518 14.3199 3.30518L9.7299 7.90518C8.8699 8.75518 8.3999 9.88518 8.3999 11.0952C8.3999 11.6152 8.4899 12.1152 8.6499 12.5552C8.8599 13.1952 9.2399 13.7952 9.7199 14.2652C10.1999 14.7552 10.7999 15.1352 11.4399 15.3452ZM3.32 20.6851C4.2 21.5551 5.35 21.9951 6.5 21.9951C7.65 21.9951 8.81 21.5551 9.69 20.7051L14.28 16.1051C15.14 15.2551 15.61 14.1251 15.61 12.9151C15.61 12.4551 15.54 11.9951 15.4 11.5551C15.17 10.8651 14.8 10.2551 14.28 9.73509C13.76 9.21509 13.15 8.84509 12.46 8.61509C12.14 8.51509 11.8 8.68509 11.7 8.99509C11.6 9.30509 11.77 9.64509 12.1 9.75509C12.61 9.91509 13.06 10.1951 13.44 10.5751C13.82 10.9551 14.09 11.4051 14.26 11.9151C14.36 12.2351 14.41 12.5651 14.41 12.9051C14.41 13.7951 14.06 14.6251 13.43 15.2451L8.84 19.8451C7.55 21.1251 5.46 21.1251 4.17 19.8451C3.55 19.2151 3.21 18.3951 3.21 17.5051C3.21 16.6151 3.55 15.7851 4.17 15.1651L7.35 11.9851C7.58 11.7451 7.59 11.3651 7.35 11.1351C7.11 10.9051 6.73 10.9051 6.5 11.1351L3.32 14.3151C2.47 15.1551 2 16.2851 2 17.4951C2 18.7051 2.47 19.8351 3.32 20.6851Z"/></svg>',
+						},
+						{
+							name: 'image',
+							action: EasyMDE.drawImage,
+							title: 'Image',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4 4C2.89543 4 2 4.89543 2 6V16V17.5152V18C2 19.1046 2.89543 20 4 20H20C21.0528 20 21.9156 19.1866 21.9942 18.1539L22 18.1632V18V16V6C22 4.89543 21.1046 4 20 4H4ZM3.2 17.7V16.5642L6.78192 13.7254C6.8616 13.6622 6.97597 13.6689 7.04776 13.7409L10.3126 17.0146C10.7026 17.4056 11.3357 17.4065 11.7268 17.0165C11.7606 16.9827 11.792 16.9465 11.8207 16.9083L16.736 10.352C16.8023 10.2636 16.9277 10.2457 17.016 10.312C17.0355 10.3265 17.0521 10.3445 17.0651 10.365L20.8 16.2669V17.7C20.8 18.3075 20.3075 18.8 19.7 18.8H4.3C3.69249 18.8 3.2 18.3075 3.2 17.7ZM17.3865 8.61836L20.8 14.08V6.3C20.8 5.69249 20.3075 5.2 19.7 5.2H4.3C3.69249 5.2 3.2 5.69249 3.2 6.3V15.04L6.65054 12.2796C6.84949 12.1204 7.13629 12.1363 7.31645 12.3164L10.8369 15.8369C10.915 15.915 11.0417 15.915 11.1198 15.8369C11.1265 15.8302 16.5625 8.58336 16.5625 8.58336C16.7282 8.36245 17.0416 8.31768 17.2625 8.48336C17.3118 8.52034 17.3538 8.56611 17.3865 8.61836ZM8 8.5C8 9.32843 7.32843 10 6.5 10C5.67157 10 5 9.32843 5 8.5C5 7.67157 5.67157 7 6.5 7C7.32843 7 8 7.67157 8 8.5Z"/></svg>',
+						},
+						{
+							name: 'table',
+							action: EasyMDE.drawTable,
+							title: 'Table',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.18524 3.08496H19.4152C20.6752 3.08496 21.7152 4.11496 21.7152 5.38496V18.615C21.7152 19.885 20.6852 20.915 19.4152 20.915H6.18524C4.91524 20.915 3.88525 19.885 3.88525 18.615V5.38496C3.88525 4.11496 4.91524 3.08496 6.18524 3.08496ZM19.4052 19.705C20.0152 19.705 20.5052 19.215 20.5052 18.605H20.5153V5.38496C20.5153 4.77496 20.0252 4.28496 19.4152 4.28496H6.18524C5.57524 4.28496 5.08521 4.77496 5.08521 5.38496V18.605C5.08521 19.215 5.57524 19.705 6.18524 19.705H19.4052ZM17.4453 9.15503H8.15527C7.82527 9.15503 7.5553 9.42503 7.5553 9.75503C7.5553 10.085 7.82527 10.355 8.15527 10.355H17.4453C17.7753 10.355 18.0453 10.085 18.0453 9.75503C18.0453 9.42503 17.7753 9.15503 17.4453 9.15503ZM17.4453 13.635H8.15527C7.82527 13.635 7.5553 13.905 7.5553 14.235C7.5553 14.565 7.82527 14.835 8.15527 14.835H17.4453C17.7753 14.835 18.0453 14.565 18.0453 14.235C18.0453 13.905 17.7753 13.635 17.4453 13.635Z"/></svg>',
+						},
+						{
+							name: 'horizontal-rule',
+							action: EasyMDE.drawHorizontalRule,
+							title: 'Horizontal Rule',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 13H3C2.45 13 2 12.55 2 12C2 11.45 2.45 11 3 11H21C21.55 11 22 11.45 22 12C22 12.55 21.55 13 21 13Z"/></svg>',
+						},
+						'|',
+						{
+							name: 'side-by-side',
+							action: EasyMDE.toggleSideBySide,
+							title: 'Side By Side',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.4787 14.58C18.3587 14.69 18.2987 14.85 18.2987 15C18.2987 15.15 18.3587 15.31 18.4787 15.42C18.7187 15.65 19.0987 15.65 19.3287 15.42L22.3287 12.42C22.5587 12.18 22.5587 11.8 22.3287 11.57L19.3287 8.56996C19.0887 8.33996 18.7087 8.33996 18.4787 8.56996C18.2487 8.80996 18.2487 9.18996 18.4787 9.41996L20.451 11.3999L14.4487 11.3999L14.4487 4.6C14.4487 4.27 14.1787 4 13.8487 4C13.5187 4 13.2487 4.27 13.2487 4.6L13.2487 19.4C13.2487 19.73 13.5187 20 13.8487 20C14.1787 20 14.4487 19.73 14.4487 19.4L14.4487 12.5999L20.4511 12.5999L18.4787 14.58ZM9.54878 19.4L9.54878 12.5999L3.5486 12.5999L5.52867 14.58C5.75867 14.81 5.75867 15.19 5.52867 15.43C5.29867 15.66 4.91867 15.66 4.67867 15.43L1.67867 12.43C1.63274 12.384 1.5956 12.3323 1.56725 12.2774C1.53058 12.2077 1.50724 12.1299 1.50068 12.0477C1.49934 12.0317 1.49867 12.0158 1.49867 12C1.49867 11.9841 1.49933 11.9682 1.50067 11.9522C1.51454 11.778 1.60365 11.6242 1.73526 11.5234L4.67867 8.57997C4.90867 8.34997 5.28867 8.34997 5.52867 8.57997C5.75867 8.80997 5.75867 9.18997 5.52867 9.42997L3.55107 11.3999L9.54878 11.3999L9.54878 4.6C9.54878 4.27 9.81878 4 10.1488 4C10.4788 4 10.7488 4.27 10.7488 4.6L10.7488 11.9999L10.7488 19.4C10.7488 19.73 10.4788 20 10.1488 20C9.81878 20 9.54878 19.73 9.54878 19.4Z"/></svg>',
+						},
+						{
+							name: 'guide',
+							action: () => {
+								window.open('https://www.markdownguide.org/basic-syntax/', '_blank')
+							},
+							title: 'Guide',
+							icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M19.4999 2.3999H6.4999C5.0699 2.3999 3.8999 3.5699 3.8999 4.9999V18.9999C3.8999 20.4299 5.0699 21.5999 6.4999 21.5999H19.4999C19.8299 21.5999 20.0999 21.3299 20.0999 20.9999V16.9999V2.9999C20.0999 2.6699 19.8299 2.3999 19.4999 2.3999ZM5.0999 4.9999V16.8118C5.50468 16.5513 5.98546 16.3999 6.4999 16.3999H18.8999V3.5999H6.4999C5.7299 3.5999 5.0999 4.2299 5.0999 4.9999ZM6.4999 17.5999H18.8999V20.3999H6.4999C5.7299 20.3999 5.0999 19.7699 5.0999 18.9999C5.0999 18.2299 5.7299 17.5999 6.4999 17.5999ZM8.4999 8.5999H15.4999C15.8299 8.5999 16.0999 8.3299 16.0999 7.9999C16.0999 7.6699 15.8299 7.3999 15.4999 7.3999H8.4999C8.1699 7.3999 7.8999 7.6699 7.8999 7.9999C7.8999 8.3299 8.1699 8.5999 8.4999 8.5999ZM15.4999 11.3999H8.4999C8.1699 11.3999 7.8999 11.6699 7.8999 11.9999C7.8999 12.3299 8.1699 12.5999 8.4999 12.5999H15.4999C15.8299 12.5999 16.0999 12.3299 16.0999 11.9999C16.0999 11.6699 15.8299 11.3999 15.4999 11.3999Z"/></svg>',
+						},
+					]
+				},
+			}
+		},
+		watch: {
+			value(newVal) {
+				this.text = newVal
+				this.$nextTick(this.renderPreview)
+			},
+			text(newVal, oldVal) {
+				if (oldVal === '') {
+					return
+				}
+				this.bubble()
+			},
+		},
+		beforeMount() {
+			this.text = this.value
+
+			if (this.previewIsDefault && this.hasPreview) {
+				this.$nextTick(this.renderPreview)
+				return
+			}
+
+			this.isPreviewActive = false
+			this.isEditActive = true
+		},
+		methods: {
+			bubble() {
+				if (this.changeTimeout !== null) {
+					clearTimeout(this.changeTimeout)
+				}
+
+				this.changeTimeout = setTimeout(() => {
+					this.$emit('input', this.text)
+					this.$emit('change')
+				}, 500)
+			},
+			replaceAt(str, index, replacement) {
+				return str.substr(0, index) + replacement + str.substr(index + replacement.length);
+			},
+			findNthIndex(str, n) {
+
+				const searchChecked = '* [x] '
+				const searchUnchecked = '* [ ] '
+
+				let inChecked, inUnchecked, startIndex = 0
+				// We're building an array with all checkboxes, checked or unchecked.
+				// I've found this to be the best way to always get the results I need.
+				// The difficulty without an index is that we need to get all checkboxes, checked and unchecked
+				// and calculate our index based off that to compare it and find the checkbox we need.
+				let checkboxes = []
+
+				// Searching in two different loops for each search term since that is way easier and more predicatble
+				// More "intelligent" solutions sometimes don't have all values or duplicates.
+				// Because we're sorting and removing duplicates of them, we can safely put everything in one giant array.
+				while ((inChecked = str.indexOf(searchChecked, startIndex)) > -1) {
+					checkboxes.push(inChecked)
+					startIndex = startIndex + searchChecked.length
+				}
+
+				startIndex = 0
+				while ((inUnchecked = str.indexOf(searchUnchecked, startIndex)) > -1) {
+					checkboxes.push(inUnchecked)
+					startIndex = startIndex + searchUnchecked.length
+				}
+
+				checkboxes.sort((a, b) => a - b)
+				checkboxes = checkboxes.filter((v, i, s) => s.indexOf(v) === i && v > -1)
+
+				return checkboxes[n]
+			},
+			renderPreview() {
+				let checkboxNum = -1
+				marked.use({
+					renderer: {
+						image: (src, title, text) => {
+
+							title = title ? ` title="${title}` : ''
+
+							// If the url starts with the api url, the image is likely an attachment and
+							// we'll need to download and parse it properly.
+							if (src.substr(0, window.API_URL.length + 7) === `${window.API_URL}/tasks/`) {
+								return `<img data-src="${src}" alt="${text}" ${title} class="attachment-image"/>`
+							}
+
+							return `<img src="${src}" alt="${text}" ${title}/>`
+						},
+						checkbox: (checked) => {
+							if (checked) {
+								checked = ' checked="checked"'
+							}
+
+							checkboxNum++
+							return `<input type="checkbox" data-checkbox-num="${checkboxNum}" ${checked} class="text-checkbox-${this._uid}"/>`
+						},
+					}
+				})
+
+				this.preview = DOMPurify.sanitize(marked(this.text))
+
+				// Since the render function is synchronous, we can't do async http requests in it.
+				// Therefore, we can't resolve the blob url at (markdown) compile time.
+				// To work around this, we modify the url after rendering it in the vue component.
+				// We're doing the whole thing in the next tick to ensure the image elements are available in the
+				// dom tree. If we're calling this right after setting this.preview it could be the images were
+				// not already made available.
+				// Some docs at https://stackoverflow.com/q/62865160/10924593
+				this.$nextTick(() => {
+					document.getElementsByClassName('attachment-image').forEach(img => {
+						// The url is something like /tasks/<id>/attachments/<id>
+						const parts = img.dataset.src.substr(window.API_URL.length + 1).split('/')
+						const taskId = parseInt(parts[1])
+						const attachmentId = parseInt(parts[3])
+						const attachment = new AttachmentModel({taskId: taskId, id: attachmentId})
+
+						if (this.attachmentService === null) {
+							this.attachmentService = new AttachmentService()
+						}
+
+						this.attachmentService.getBlobUrl(attachment)
+							.then(url => {
+								img.src = url
+							})
+					})
+
+					document.getElementsByClassName(`text-checkbox-${this._uid}`).forEach(check => {
+						check.removeEventListener('change', this.handleCheckboxClick)
+						check.addEventListener('change', this.handleCheckboxClick)
+					})
+				})
+			},
+			handleCheckboxClick(e) {
+				// Find the original markdown checkbox this is targeting
+				const checked = e.target.checked
+				const numMarkdownCheck = parseInt(e.target.dataset.checkboxNum)
+
+				const index = this.findNthIndex(this.text, numMarkdownCheck)
+				if (index < 0 || typeof index === 'undefined') {
+					console.log('no index found')
+					return
+				}
+				console.log(index, this.text.substr(index, 9))
+
+				if (checked) {
+					this.text = this.replaceAt(this.text, index, '* [x] ')
+				} else {
+					this.text = this.replaceAt(this.text, index, '* [ ] ')
+				}
+				this.bubble()
+				this.renderPreview()
+			},
+			showPreview() {
+				this.isPreviewActive = true
+				this.isEditActive = false
+				this.renderPreview()
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	@import '../../../node_modules/easymde/dist/easymde.min.css';
+	@import '../../styles/theme/variables';
+
+	.editor {
+		.tabs ul {
+			margin-left: 0;
+		}
+	}
+
+	.CodeMirror {
+		padding: 0;
+		border: 1px solid $editor-border-color;
+
+		&-lines pre {
+			margin: 0 !important;
+		}
+	}
+
+	.CodeMirror-scroll {
+		padding: .5em;
+	}
+
+	.editor-toolbar {
+		background: #ffffff;
+		border-top: 1px solid $editor-border-color;
+		border-left: 1px solid $editor-border-color;
+		border-right: 1px solid $editor-border-color;
+
+		button {
+			svg {
+				vertical-align: middle;
+
+				&, rect {
+					width: 20px;
+					height: 20px;
+				}
+			}
+
+			&:after {
+				position: absolute;
+				top: 24px;
+				margin-left: -3px;
+			}
+		}
+	}
+
+	pre.CodeMirror-line {
+		margin-bottom: 0 !important;
+	}
+
+	.cm-header {
+		font-family: $vikunja-font;
+		font-weight: 400;
+	}
+</style>
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 5886ada7..9fdb8b55 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -3,17 +3,28 @@
 		<div class="field">
 			<label class="label" for="tasktext">Task Text</label>
 			<div class="control">
-				<input v-focus :class="{ 'disabled': taskService.loading}" :disabled="taskService.loading" class="input"
-					type="text" id="tasktext" placeholder="The task text is here..." v-model="taskEditTask.title" @change="editTaskSubmit()">
+				<input
+						v-focus
+						:class="{ 'disabled': taskService.loading}"
+						:disabled="taskService.loading"
+						class="input"
+						type="text"
+						id="tasktext"
+						placeholder="The task text is here..."
+						v-model="taskEditTask.title"
+						@change="editTaskSubmit()"/>
 			</div>
 		</div>
 		<div class="field">
 			<label class="label" for="taskdescription">Description</label>
 			<div class="control">
-				<textarea :class="{ 'disabled': taskService.loading}" :disabled="taskService.loading" class="textarea"
-					placeholder="The tasks description goes here..." id="taskdescription"
-					v-model="taskEditTask.description" @change="editTaskSubmit()">
-				</textarea>
+				<editor
+						placeholder="The tasks description goes here..."
+						id="taskdescription"
+						v-model="taskEditTask.description"
+						:preview-is-default="false"
+						v-if="editorActive"
+				/>
 			</div>
 		</div>
 
@@ -106,7 +117,10 @@
 
 		<div class="field has-addons">
 			<div class="control is-expanded">
-				<edit-assignees :task-id="taskEditTask.id" :list-id="taskEditTask.listId" :initial-assignees="taskEditTask.assignees"/>
+				<edit-assignees
+						:task-id="taskEditTask.id"
+						:list-id="taskEditTask.listId"
+						:initial-assignees="taskEditTask.assignees"/>
 			</div>
 		</div>
 
@@ -118,10 +132,10 @@
 		</div>
 
 		<related-tasks
-			class="is-narrow"
-			:task-id="task.id"
-			:list-id="task.listId"
-			:initial-related-tasks="task.relatedTasks"
+				class="is-narrow"
+				:task-id="task.id"
+				:list-id="task.listId"
+				:initial-related-tasks="task.relatedTasks"
 		/>
 
 		<button type="submit" class="button is-success is-fullwidth" :class="{ 'is-loading': taskService.loading}">
@@ -158,6 +172,7 @@
 
 				priorities: priorities,
 				list: {},
+				editorActive: false,
 				newTask: TaskModel,
 				isTaskEdit: false,
 				taskEditTask: TaskModel,
@@ -181,6 +196,7 @@
 			PercentDoneSelect,
 			PrioritySelect,
 			flatPickr,
+			editor: () => import(/* webpackPrefetch: true */ '../../components/input/editor'),
 		},
 		props: {
 			task: {
@@ -206,6 +222,13 @@
 				this.taskEditTask.dueDate = +new Date(this.task.dueDate) === 0 ? null : this.task.dueDate
 				this.taskEditTask.startDate = +new Date(this.task.startDate) === 0 ? null : this.task.startDate
 				this.taskEditTask.endDate = +new Date(this.task.endDate) === 0 ? null : this.task.endDate
+				// This makes the editor trigger its mounted function again which makes it forget every input
+				// it currently has in its textarea. This is a counter-hack to a hack inside of vue-easymde
+				// which made it impossible to detect change from the outside. Therefore the component would
+				// not update if new content from the outside was made available.
+				// See https://github.com/NikulinIlya/vue-easymde/issues/3
+				this.editorActive = false
+				this.$nextTick(() => this.editorActive = true)
 			},
 			editTaskSubmit() {
 				this.taskService.update(this.taskEditTask)
diff --git a/src/components/tasks/mixins/attachmentUpload.js b/src/components/tasks/mixins/attachmentUpload.js
new file mode 100644
index 00000000..7dac9340
--- /dev/null
+++ b/src/components/tasks/mixins/attachmentUpload.js
@@ -0,0 +1,32 @@
+import AttachmentModel from '../../../models/attachment'
+import AttachmentService from '../../../services/attachment'
+
+export default {
+	methods: {
+		attachmentUpload(file, onSuccess) {
+			const files = [file]
+
+			const attachmentService = new AttachmentService()
+
+			const attachmentModel = new AttachmentModel({taskId: this.taskId})
+			attachmentService.create(attachmentModel, files)
+				.then(r => {
+					if (r.success !== null) {
+						r.success.forEach(a => {
+							this.$store.commit('attachments/add', a)
+							this.$store.dispatch('tasks/addTaskAttachment', {taskId: this.taskId, attachment: a})
+							onSuccess(`${window.API_URL}/tasks/${this.taskId}/attachments/${a.id}`)
+						})
+					}
+					if (r.errors !== null) {
+						r.errors.forEach(m => {
+							this.error(m)
+						})
+					}
+				})
+				.catch(e => {
+					this.error(e, this)
+				})
+		},
+	}
+}
\ No newline at end of file
diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue
index 9e432000..4b176ce1 100644
--- a/src/components/tasks/partials/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -79,6 +79,7 @@
 	import AttachmentService from '../../../services/attachment'
 	import AttachmentModel from '../../../models/attachment'
 	import User from '../../misc/user'
+	import {mapState} from 'vuex'
 
 	export default {
 		name: 'attachments',
@@ -87,7 +88,6 @@
 		},
 		data() {
 			return {
-				attachments: [],
 				attachmentService: AttachmentService,
 				showDropzone: false,
 
@@ -106,8 +106,10 @@
 		},
 		created() {
 			this.attachmentService = new AttachmentService()
-			this.attachments = this.initialAttachments
 		},
+		computed: mapState({
+			attachments: state => state.attachments.attachments
+		}),
 		mounted() {
 			document.addEventListener('dragenter', e => {
 				e.stopPropagation()
@@ -136,11 +138,6 @@
 				this.showDropzone = false
 			})
 		},
-		watch: {
-			initialAttachments(newVal) {
-				this.attachments = newVal
-			},
-		},
 		methods: {
 			downloadAttachment(attachment) {
 				this.attachmentService.download(attachment)
@@ -158,7 +155,7 @@
 					.then(r => {
 						if(r.success !== null) {
 							r.success.forEach(a => {
-								this.attachments.push(a)
+								this.$store.commit('attachments/add', a)
 								this.$store.dispatch('tasks/addTaskAttachment', {taskId: this.taskId, attachment: a})
 							})
 						}
@@ -171,17 +168,11 @@
 					.catch(e => {
 						this.error(e, this)
 					})
-
 			},
 			deleteAttachment() {
 				this.attachmentService.delete(this.attachmentToDelete)
 					.then(r => {
-						// Remove the file from the list
-						for (const a in this.attachments) {
-							if (this.attachments[a].id === this.attachmentToDelete.id) {
-								this.attachments.splice(a, 1)
-							}
-						}
+						this.$store.commit('attachments/removeById', this.attachmentToDelete.id)
 						this.success(r, this)
 					})
 					.catch(e => {
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 4dbf98f1..6aa34cbf 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -7,33 +7,29 @@
 			Comments
 		</h1>
 		<div class="comments">
-			<progress class="progress is-small is-info" max="100" v-if="taskCommentService.loading">Loading comments...</progress>
+			<progress class="progress is-small is-info" max="100" v-if="taskCommentService.loading">Loading
+				comments...
+			</progress>
 			<div class="media comment" v-for="c in comments" :key="c.id">
 				<figure class="media-left">
 					<img class="image is-avatar" :src="c.author.getAvatarUrl(48)" alt="" width="48" height="48"/>
 				</figure>
 				<div class="media-content">
-					<div class="form" v-if="isCommentEdit && commentEdit.id === c.id">
-						<div class="field">
-							<textarea class="textarea" :class="{'is-loading': taskCommentService.loading}" placeholder="Add your comment..." v-model="commentEdit.comment" @keyup.ctrl.enter="editComment()"></textarea>
-						</div>
-						<div class="field">
-							<button class="button is-primary" :class="{'is-loading': taskCommentService.loading}" @click="editComment()" :disabled="commentEdit.comment === ''">Comment</button>
-							<a @click="() => isCommentEdit = false">Cancel</a>
-						</div>
-					</div>
-					<div class="content" v-else>
+					<div class="comment-info">
 						<strong>{{ c.author.username }}</strong>&nbsp;
 						<small v-tooltip="formatDate(c.created)">{{ formatDateSince(c.created) }}</small>
-						<small v-if="+new Date(c.created) !== +new Date(c.updated)" v-tooltip="formatDate(c.updated)"> · edited {{ formatDateSince(c.updated) }}</small>
-						<br/>
-						<p>
-							{{c.comment}}
-						</p>
-						<div class="comment-actions">
-							<a @click="toggleEdit(c)">Edit</a>&nbsp;·&nbsp;
-							<a @click="toggleDelete(c.id)">Remove</a>
-						</div>
+						<small v-if="+new Date(c.created) !== +new Date(c.updated)" v-tooltip="formatDate(c.updated)"> ·
+							edited {{ formatDateSince(c.updated) }}</small>
+					</div>
+					<editor
+							v-model="c.comment"
+							:has-preview="true"
+							@change="() => {toggleEdit(c);editComment()}"
+							:upload-enabled="true"
+							:upload-callback="attachmentUpload"
+					/>
+					<div class="comment-actions">
+						<a @click="toggleDelete(c.id)">Remove</a>
 					</div>
 				</div>
 			</div>
@@ -44,10 +40,21 @@
 				<div class="media-content">
 					<div class="form">
 						<div class="field">
-							<textarea class="textarea" :class="{'is-loading': taskCommentService.loading && !isCommentEdit}" placeholder="Add your comment..." v-model="newComment.comment" @keyup.ctrl.enter="addComment()"></textarea>
+							<editor
+									placeholder="Add your comment..."
+									:class="{'is-loading': taskCommentService.loading && !isCommentEdit}"
+									v-model="newComment.comment"
+									:has-preview="false"
+									:upload-enabled="true"
+									:upload-callback="attachmentUpload"
+									v-if="editorActive"
+							/>
 						</div>
 						<div class="field">
-							<button class="button is-primary" :class="{'is-loading': taskCommentService.loading && !isCommentEdit}" @click="addComment()" :disabled="newComment.comment === ''">Comment</button>
+							<button class="button is-primary"
+									:class="{'is-loading': taskCommentService.loading && !isCommentEdit}"
+									@click="addComment()" :disabled="newComment.comment === ''">Comment
+							</button>
 						</div>
 					</div>
 				</div>
@@ -67,9 +74,16 @@
 <script>
 	import TaskCommentService from '../../../services/taskComment'
 	import TaskCommentModel from '../../../models/taskComment'
+	import attachmentUpload from '../mixins/attachmentUpload'
 
 	export default {
 		name: 'comments',
+		components: {
+			editor: () => import(/* webpackPrefetch: true */ '../../input/editor'),
+		},
+		mixins: [
+			attachmentUpload,
+		],
 		props: {
 			taskId: {
 				type: Number,
@@ -88,6 +102,7 @@
 
 				taskCommentService: TaskCommentService,
 				newComment: TaskCommentModel,
+				editorActive: true,
 			}
 		},
 		created() {
@@ -124,6 +139,15 @@
 				if (this.newComment.comment === '') {
 					return
 				}
+
+				// This makes the editor trigger its mounted function again which makes it forget every input
+				// it currently has in its textarea. This is a counter-hack to a hack inside of vue-easymde
+				// which made it impossible to detect change from the outside. Therefore the component would
+				// not update if new content from the outside was made available.
+				// See https://github.com/NikulinIlya/vue-easymde/issues/3
+				this.editorActive = false
+				this.$nextTick(() => this.editorActive = true)
+
 				this.taskCommentService.create(this.newComment)
 					.then(r => {
 						this.comments.push(r)
diff --git a/src/main.js b/src/main.js
index e6678562..2ee2d5d3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -147,6 +147,9 @@ import {setTitle} from './helpers/setTitle'
 Vue.mixin({
 	methods: {
 		formatDateSince: date => {
+			if (typeof date === 'string') {
+				date = new Date(date)
+			}
 			const currentDate = new Date()
 			let formatted = '';
 			if (date > currentDate) {
@@ -159,7 +162,12 @@ Vue.mixin({
 
 			return formatted;
 		},
-		formatDate: date => format(date, 'PPPPpppp'),
+		formatDate: date => {
+			if (typeof date === 'string') {
+				date = new Date(date)
+			}
+			return date ? format(date, 'PPPPpppp'): ''
+		},
 		error: (e, context, actions = []) => message.error(e, context, actions),
 		success: (s, context, actions = []) => message.success(s, context, actions),
 		colorIsDark: colorIsDark,
diff --git a/src/services/attachment.js b/src/services/attachment.js
index 4edefd88..df51ba0a 100644
--- a/src/services/attachment.js
+++ b/src/services/attachment.js
@@ -34,19 +34,24 @@ export default class AttachmentService extends AbstractService {
 		return data
 	}
 
-	download(model) {
-		this.http({
+	getBlobUrl(model) {
+		return this.http({
 			url: '/tasks/' + model.taskId + '/attachments/' + model.id,
 			method: 'GET',
 			responseType: 'blob',
-		}).then((response) => {
-			const url = window.URL.createObjectURL(new Blob([response.data]));
+		}).then(response => {
+			return window.URL.createObjectURL(new Blob([response.data]));
+		})
+	}
+
+	download(model) {
+		this.getBlobUrl(model).then(url => {
 			const link = document.createElement('a');
 			link.href = url;
 			link.setAttribute('download', model.file.name);
 			link.click();
 			window.URL.revokeObjectURL(url);
-		});
+		})
 	}
 
 	/**
diff --git a/src/store/index.js b/src/store/index.js
index 3e0e664f..a9822b42 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,6 +10,8 @@ import namespaces from './modules/namespaces'
 import kanban from './modules/kanban'
 import tasks from './modules/tasks'
 import lists from './modules/lists'
+import attachments from './modules/attachments'
+
 import ListService from '../services/list'
 import {setTitle} from '../helpers/setTitle'
 
@@ -21,6 +23,7 @@ export const store = new Vuex.Store({
 		kanban,
 		tasks,
 		lists,
+		attachments,
 	},
 	state: {
 		loading: false,
diff --git a/src/store/modules/attachments.js b/src/store/modules/attachments.js
new file mode 100644
index 00000000..87178092
--- /dev/null
+++ b/src/store/modules/attachments.js
@@ -0,0 +1,24 @@
+import Vue from 'vue'
+
+export default {
+	namespaced: true,
+	state: () => ({
+		attachments: [],
+	}),
+	mutations: {
+		set(state, attachments) {
+			Vue.set(state, 'attachments', attachments)
+		},
+		add(state, attachment) {
+			state.attachments.push(attachment)
+		},
+		removeById(state, id) {
+			for (const a in state.attachments) {
+				if (state.attachments[a].id === id) {
+					state.attachments.splice(a, 1)
+					break
+				}
+			}
+		},
+	},
+}
\ No newline at end of file
diff --git a/src/store/modules/tasks.js b/src/store/modules/tasks.js
index da66336d..6145934c 100644
--- a/src/store/modules/tasks.js
+++ b/src/store/modules/tasks.js
@@ -39,6 +39,7 @@ export default {
 			}
 			t.task.attachments.push(attachment)
 			ctx.commit('kanban/setTaskInBucketByIndex', t, {root: true})
+			ctx.commit('attachments/add', attachment, {root: true})
 		},
 		addAssignee(ctx, {user, taskId}) {
 
diff --git a/src/styles/components/comments.scss b/src/styles/components/comments.scss
index 6fd3c4f4..1ccb3b39 100644
--- a/src/styles/components/comments.scss
+++ b/src/styles/components/comments.scss
@@ -1,10 +1,24 @@
-.media.comment{
+.media.comment {
   align-items: center;
 
   .media-left {
     margin: 0 1em;
   }
 
+  @media screen and (min-width: $tablet) {
+    .comment-info {
+      margin-bottom: -3rem;
+    }
+  }
+
+  .editor .tabs {
+    margin-bottom: 0;
+
+    ul {
+      border-bottom: none;
+    }
+  }
+
   .comment-actions {
     font-size: .8em;
 
diff --git a/src/styles/theme/variables.scss b/src/styles/theme/variables.scss
index 8ced53d3..bb46b809 100644
--- a/src/styles/theme/variables.scss
+++ b/src/styles/theme/variables.scss
@@ -51,3 +51,5 @@ $hamburger-menu-icon-spacing: 1rem;
 $hamburger-menu-icon-width: 28px;
 $navbar-height: 4rem;
 $navbar-width: 17vw;
+
+$editor-border-color: #ddd;
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index 6c78ebaa..dc7368e3 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -55,10 +55,12 @@
 							<div class="field">
 								<label class="label">Description</label>
 								<div class="control">
-									<textarea
-											class="textarea"
+									<editor
 											placeholder="Label description"
-											v-model="labelEditLabel.description"></textarea>
+											v-model="labelEditLabel.description"
+											:preview-is-default="false"
+											v-if="editorActive"
+									/>
 								</div>
 							</div>
 							<div class="field">
@@ -69,7 +71,7 @@
 							</div>
 							<div class="field has-addons">
 								<div class="control is-expanded">
-									<button type="submit" class="button is-fullwidth is-success"
+									<button type="submit" class="button is-fullwidth is-primary"
 											:class="{ 'is-loading': labelService.loading}">
 										Save
 									</button>
@@ -103,6 +105,7 @@
 		name: 'ListLabels',
 		components: {
 			ColorPicker,
+			editor: () => import(/* webpackPrefetch: true */ '../../components/input/editor'),
 		},
 		data() {
 			return {
@@ -110,6 +113,7 @@
 				labels: [],
 				labelEditLabel: LabelModel,
 				isLabelEdit: false,
+				editorActive: false,
 			}
 		},
 		created() {
@@ -128,7 +132,7 @@
 				const getAllLabels = (page = 1) => {
 					return this.labelService.getAll({}, {}, page)
 						.then(labels => {
-							if(page < this.labelService.totalPages) {
+							if (page < this.labelService.totalPages) {
 								return getAllLabels(page + 1)
 									.then(nextLabels => {
 										return labels.concat(nextLabels)
@@ -185,6 +189,14 @@
 				}
 				this.labelEditLabel = label
 				this.isLabelEdit = true
+
+				// This makes the editor trigger its mounted function again which makes it forget every input
+				// it currently has in its textarea. This is a counter-hack to a hack inside of vue-easymde
+				// which made it impossible to detect change from the outside. Therefore the component would
+				// not update if new content from the outside was made available.
+				// See https://github.com/NikulinIlya/vue-easymde/issues/3
+				this.editorActive = false
+				this.$nextTick(() => this.editorActive = true)
 			}
 		}
 	}
diff --git a/src/views/list/EditList.vue b/src/views/list/EditList.vue
index c41f4739..659bf21b 100644
--- a/src/views/list/EditList.vue
+++ b/src/views/list/EditList.vue
@@ -51,13 +51,14 @@
 						<div class="field">
 							<label class="label" for="listdescription">Description</label>
 							<div class="control">
-								<textarea
+								<editor
 										:class="{ 'disabled': listService.loading}"
 										:disabled="listService.loading"
-										class="textarea"
 										placeholder="The lists description goes here..."
 										id="listdescription"
-										v-model="list.description"></textarea>
+										v-model="list.description"
+										:preview-is-default="false"
+								/>
 							</div>
 						</div>
 						<div class="field">
@@ -190,6 +191,7 @@
 			Fancycheckbox,
 			LinkSharing,
 			manageSharing,
+			editor: () => import(/* webpackPrefetch: true */ '../../components/input/editor'),
 		},
 		created() {
 			this.listService = new ListService()
diff --git a/src/views/namespaces/EditNamespace.vue b/src/views/namespaces/EditNamespace.vue
index a5afc6e3..df951cb0 100644
--- a/src/views/namespaces/EditNamespace.vue
+++ b/src/views/namespaces/EditNamespace.vue
@@ -30,13 +30,15 @@
 						<div class="field">
 							<label class="label" for="namespacedescription">Description</label>
 							<div class="control">
-								<textarea
+								<editor
 										:class="{ 'disabled': namespaceService.loading}"
 										:disabled="namespaceService.loading"
-										class="textarea"
 										placeholder="The namespaces description goes here..."
 										id="namespacedescription"
-										v-model="namespace.description"></textarea>
+										v-model="namespace.description"
+										:preview-is-default="false"
+										v-if="editorActive"
+								/>
 							</div>
 						</div>
 						<div class="field">
@@ -120,12 +122,14 @@
 
 				namespace: NamespaceModel,
 				showDeleteModal: false,
+				editorActive: false,
 			}
 		},
 		components: {
 			ColorPicker,
 			Fancycheckbox,
 			manageSharing,
+			editor: () => import(/* webpackPrefetch: true */ '../../components/input/editor'),
 		},
 		beforeMount() {
 			this.namespace.id = this.$route.params.id
@@ -146,6 +150,14 @@
 		},
 		methods: {
 			loadNamespace() {
+				// This makes the editor trigger its mounted function again which makes it forget every input
+				// it currently has in its textarea. This is a counter-hack to a hack inside of vue-easymde
+				// which made it impossible to detect change from the outside. Therefore the component would
+				// not update if new content from the outside was made available.
+				// See https://github.com/NikulinIlya/vue-easymde/issues/3
+				this.editorActive = false
+				this.$nextTick(() => this.editorActive = true)
+
 				let namespace = new NamespaceModel({id: this.$route.params.id})
 				this.namespaceService.get(namespace)
 					.then(r => {
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 940f7bb4..148f6a48 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -180,24 +180,18 @@
 							</span>
 							Description
 						</h3>
-						<!-- We're using a normal textarea until the problem with the icons is resolved in easymde -->
-						<!-- <easymde v-model="task.description" @change="saveTask"/>-->
-						<textarea
-								class="textarea"
+						<editor
 								v-model="task.description"
-								rows="6"
-								placeholder="Click here to enter a description..."
-								@keyup.ctrl.enter="saveTaskIfDescriptionChanged"
-								@keydown="setDescriptionChanged"
-								@change="saveTaskIfDescriptionChanged"
-						></textarea>
+								@change="saveTask"
+								:upload-enabled="true"
+								:upload-callback="attachmentUpload"
+								placeholder="Click here to enter a description..."/>
 					</div>
 
 					<!-- Attachments -->
 					<div class="content attachments has-top-border" v-if="activeFields.attachments">
 						<attachments
 								:task-id="taskId"
-								:initial-attachments="task.attachments"
 								ref="attachments"
 						/>
 					</div>
@@ -335,6 +329,7 @@
 
 	import flatPickr from 'vue-flatpickr-component'
 	import 'flatpickr/dist/flatpickr.css'
+
 	import PrioritySelect from '../../components/tasks/partials/prioritySelect'
 	import PercentDoneSelect from '../../components/tasks/partials/percentDoneSelect'
 	import EditLabels from '../../components/tasks/partials/editLabels'
@@ -346,7 +341,8 @@
 	import Comments from '../../components/tasks/partials/comments'
 	import router from '../../router'
 	import ListSearch from '../../components/tasks/partials/listSearch'
-	import ColorPicker from "../../components/input/colorPicker";
+	import ColorPicker from '../../components/input/colorPicker'
+	import attachmentUpload from '../../components/tasks/mixins/attachmentUpload'
 
 	export default {
 		name: 'TaskDetailView',
@@ -363,7 +359,11 @@
 			PrioritySelect,
 			Comments,
 			flatPickr,
+			editor: () => import(/* webpackPrefetch: true */ '../../components/input/editor'),
 		},
+		mixins: [
+			attachmentUpload,
+		],
 		data() {
 			return {
 				taskId: Number(this.$route.params.id),
@@ -450,6 +450,7 @@
 				this.taskService.get({id: this.taskId})
 					.then(r => {
 						this.$set(this, 'task', r)
+						this.$store.commit('attachments/set', r.attachments)
 						this.taskTitle = this.task.title
 						this.taskColor = this.task.hexColor
 						this.setActiveFields()
@@ -563,7 +564,7 @@
 			changeList(list) {
 				this.task.listId = list.id
 				this.saveTask()
-			}
+			},
 		},
 	}
 </script>
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index d19dc884..58dd96e6 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -29,20 +29,21 @@
 						<div class="field">
 							<label class="label" for="teamdescription">Description</label>
 							<div class="control">
-								<textarea
+								<editor
 										:class="{ 'disabled': teamService.loading}"
 										:disabled="teamService.loading"
-										class="textarea"
 										placeholder="The teams description goes here..."
 										id="teamdescription"
-										v-model="team.description"></textarea>
+										v-model="team.description"
+										:preview-is-default="false"
+								/>
 							</div>
 						</div>
 					</form>
 
 					<div class="columns bigbuttons">
 						<div class="column">
-							<button @click="submit()" class="button is-success is-fullwidth"
+							<button @click="submit()" class="button is-primary is-fullwidth"
 									:class="{ 'is-loading': teamService.loading}">
 								Save
 							</button>
@@ -207,6 +208,7 @@
 		},
 		components: {
 			multiselect,
+			editor: () => import(/* webpackPrefetch: true */ '../../components/input/editor'),
 		},
 		created() {
 			this.teamService = new TeamService()
diff --git a/yarn.lock b/yarn.lock
index ab44a2dc..ad806ae0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5069,6 +5069,11 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
+dompurify@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.12.tgz#284a2b041e1c60b8e72d7b4d2fadad36141254ae"
+  integrity sha512-Fl8KseK1imyhErHypFPA8qpq9gPzlsJ/EukA6yk9o0gX23p1TzC+rh9LqNg1qvErRTc0UNMYlKxEGSfSh43NDg==
+
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"