diff --git a/src/components/card/AttachmentList.vue b/src/components/card/AttachmentList.vue
old mode 100644
new mode 100755
index 5282f4c5e..6b86c94b5
--- a/src/components/card/AttachmentList.vue
+++ b/src/components/card/AttachmentList.vue
@@ -37,15 +37,7 @@
 			@change="handleUploadFile">
 		<ul class="attachment-list">
 			<li v-for="attachment in uploadQueue" :key="attachment.name" class="attachment">
-				<a class="fileicon" :style="mimetypeForAttachment()" />
-				<div class="details">
-					<a>
-						<div class="filename">
-							<span class="basename">{{ attachment.name }}</span>
-						</div>
-						<progress :value="attachment.progress" max="100" />
-					</a>
-				</div>
+				<AttachmentUploadProgress :attachment="attachment" />
 			</li>
 			<li v-for="attachment in attachments"
 				:key="attachment.id"
@@ -113,6 +105,7 @@ import { mapState, mapActions } from 'vuex'
 import { loadState } from '@nextcloud/initial-state'
 import attachmentUpload from '../../mixins/attachmentUpload.js'
 import { getFilePickerBuilder } from '@nextcloud/dialogs'
+import AttachmentUploadProgress from './AttachmentUploadProgress.vue'
 const maxUploadSizeState = loadState('deck', 'maxUploadSize')
 
 const picker = getFilePickerBuilder(t('deck', 'File to share'))
@@ -129,6 +122,7 @@ export default {
 		NcActionButton,
 		NcActionLink,
 		AttachmentDragAndDrop,
+		AttachmentUploadProgress,
 	},
 	mixins: [relativeDate, attachmentUpload],
 
diff --git a/src/components/card/AttachmentUploadProgress.vue b/src/components/card/AttachmentUploadProgress.vue
new file mode 100644
index 000000000..eafea3c53
--- /dev/null
+++ b/src/components/card/AttachmentUploadProgress.vue
@@ -0,0 +1,55 @@
+<!--
+  - @copyright Copyright (c) 2022 Julius Härtl <rija.propitech@gmail.com>
+  -
+  - @author Julius Härtl <rija.propitech@gmail.com>
+  -
+  - @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="progress-main">
+		<a class="fileicon" />
+		<div class="details">
+			<a>
+				<div class="filename">
+					<span class="basename">{{ attachment.name }}</span>
+				</div>
+				<progress :value="attachment.progress" max="100" />
+			</a>
+		</div>
+	</div>
+</template>
+
+<script>
+
+export default {
+	name: 'AttachmentUploadProgress',
+	props: {
+		attachment: {
+			type: Object,
+			default: null,
+		},
+	},
+}
+
+</script>
+
+<style lang="scss" scoped>
+	.progress-main {
+		width: 100%;
+	}
+</style>
diff --git a/src/components/card/Description.vue b/src/components/card/Description.vue
index 6e6046c18..d44e16717 100644
--- a/src/components/card/Description.vue
+++ b/src/components/card/Description.vue
@@ -21,11 +21,15 @@
   -->
 
 <template>
-	<div>
+	<div @paste="onPaste">
 		<h5>
 			{{ t('deck', 'Description') }}
 			<span v-if="descriptionLastEdit && !descriptionSaving">{{ t('deck', '(Unsaved)') }}</span>
 			<span v-if="descriptionSaving">{{ t('deck', '(Saving…)') }}</span>
+			<span v-for="attachment in uploadQueue" v-bind:key="attachment.name">
+				<AttachmentUploadProgress :attachment="attachment" />
+			</span>
+
 			<a v-tooltip="t('deck', 'Formatting help')"
 				href="https://deck.readthedocs.io/en/latest/Markdown/"
 				target="_blank"
@@ -80,10 +84,12 @@ import MarkdownIt from 'markdown-it'
 import MarkdownItTaskCheckbox from 'markdown-it-task-checkbox'
 import MarkdownItLinkAttributes from 'markdown-it-link-attributes'
 import AttachmentList from './AttachmentList.vue'
+import AttachmentUploadProgress from './AttachmentUploadProgress.vue'
 import { NcActions, NcActionButton, NcModal } from '@nextcloud/vue'
 import { formatFileSize } from '@nextcloud/files'
 import { generateUrl } from '@nextcloud/router'
 import { mapState, mapGetters } from 'vuex'
+import attachmentUpload from '../../mixins/attachmentUpload.js'
 import PaperclipIcon from 'vue-material-design-icons/Paperclip.vue'
 
 const markdownIt = new MarkdownIt({
@@ -107,7 +113,10 @@ export default {
 		NcModal,
 		AttachmentList,
 		PaperclipIcon,
+		AttachmentUploadProgress,
 	},
+	mixins: [attachmentUpload],
+
 	props: {
 		card: {
 			type: Object,
@@ -174,6 +183,9 @@ export default {
 		hasDescription() {
 			return this.card?.description?.trim?.() !== ''
 		},
+		cardId() {
+			return this.card.id
+		},
 	},
 	methods: {
 		addKeyListeners() {
@@ -212,18 +224,35 @@ export default {
 		showAttachmentModal() {
 			this.modalShow = true
 		},
-		addAttachment(attachment) {
-			const descString = this.$refs.markdownEditor.easymde.value()
+		async addAttachment(attachment) {
 			let embed = ''
 			if ((attachment.type === 'file' && attachment.extendedData.hasPreview) || attachment.extendedData.mimetype.includes('image')) {
 				embed = '!'
 			}
 			const attachmentString = embed + '[📎 ' + attachment.data + '](' + this.attachmentPreview(attachment) + ')'
-			const newContent = descString + '\n' + attachmentString
+			const cursor = this.$refs.markdownEditor.easymde.codemirror.getCursor()
+			const descStringLines = this.$refs.markdownEditor.easymde.value().split('\n')
+			let lineUpatedLength = 0
+
+			for (let i = 0; i < descStringLines.length; i++) {
+				if (i === cursor.line) {
+					descStringLines[i] = descStringLines[i].substring(0, cursor.ch) + attachmentString + descStringLines[i].substring(cursor.ch)
+					lineUpatedLength = descStringLines[i].length
+					break
+				}
+			}
+
+			const newContent = descStringLines.join('\n')
 			this.$refs.markdownEditor.easymde.value(newContent)
 			this.description = newContent
 			this.modalShow = false
 			this.updateDescription()
+
+			if (lineUpatedLength > 0) {
+				await this.$nextTick()
+				this.$refs.markdownEditor.easymde.codemirror.focus()
+				this.$refs.markdownEditor.easymde.codemirror.setCursor({ line: cursor.line, ch: lineUpatedLength })
+			}
 		},
 		clickedPreview(e) {
 			if (e.target.getAttribute('type') === 'checkbox') {
@@ -263,6 +292,40 @@ export default {
 				await this.saveDescription()
 			}, 2500)
 		},
+		async addLastAttachmmentOnCursor() {
+			const attachementLength = this.$store.getters.attachmentsByCard(this.card.id).length
+			if (attachementLength === 0) {
+				return
+			}
+			this.addAttachment(this.$store.getters.attachmentsByCard(this.card.id)[attachementLength - 1])
+		},
+		onPaste() {
+			if (!this.descriptionEditing) {
+				return
+			}
+
+			const clipboardData = event.clipboardData
+			let files = []
+			if (clipboardData.files && clipboardData.files.length > 0) {
+				files = clipboardData.files
+			} else if (clipboardData.items && clipboardData.items.length > 0) {
+				for (let i = 0; i < clipboardData.items.length; i++) {
+					if (clipboardData.items[i].kind === 'file') {
+						files.push(clipboardData.items[i].getAsFile())
+					}
+				}
+			}
+
+			if (files.length === 0) {
+				return
+			}
+
+			this.loading = true
+			event.preventDefault()
+			for (const file of files) {
+				this.onLocalAttachmentSelected(file, 'file').then(this.addLastAttachmmentOnCursor)
+			}
+		},
 	},
 }
 </script>