diff --git a/appinfo/routes.php b/appinfo/routes.php
index fa05e3aa7..a954653bf 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -83,6 +83,20 @@
 		'requirements' => ['id' => '\d+'],
 	],
 
+	//////////  A T T A C H M E N T S  //////////
+
+	[
+		'name' => 'notes#getAttachment',
+		'url' => '/notes/{noteid}/attachment',
+		'verb' => 'GET',
+		'requirements' => ['noteid' => '\d+'],
+	],
+	[
+		'name' => 'notes#uploadFile',
+		'url' => '/notes/{noteid}/attachment',
+		'verb' => 'POST',
+		'requirements' => ['noteid' => '\d+'],
+	],
 
 	//////////  S E T T I N G S  //////////
 	['name' => 'settings#set', 'url' => '/settings', 'verb' => 'PUT'],
diff --git a/lib/Controller/NotesController.php b/lib/Controller/NotesController.php
index 18a55823c..f90934c0a 100644
--- a/lib/Controller/NotesController.php
+++ b/lib/Controller/NotesController.php
@@ -9,6 +9,7 @@
 use OCA\Notes\Service\SettingsService;
 
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\IRequest;
 use OCP\IConfig;
 use OCP\IL10N;
@@ -296,4 +297,39 @@ public function destroy(int $id) : JSONResponse {
 			return [];
 		});
 	}
+
+	/**
+	 * With help from: https://github.com/nextcloud/cookbook
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 * @return JSONResponse|FileDisplayResponse
+	 */
+	public function getAttachment(int $noteid, string $path) {
+		try {
+			$targetimage = $this->notesService->getAttachment(
+				$this->helper->getUID(),
+				$noteid,
+				$path
+			);
+			$headers = ['Content-Type' => $targetimage->getMimetype(), 'Cache-Control' => 'public, max-age=604800'];
+			return new FileDisplayResponse($targetimage, Http::STATUS_OK, $headers);
+		} catch (\Exception $e) {
+			$this->helper->logException($e);
+			return $this->helper->createErrorResponse($e, Http::STATUS_NOT_FOUND);
+		}
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function uploadFile(int $noteid): JSONResponse {
+		$file = $this->request->getUploadedFile('file');
+		return $this->helper->handleErrorResponse(function () use ($noteid, $file) {
+			return $this->notesService->createImage(
+				$this->helper->getUID(),
+				$noteid,
+				$file
+			);
+		});
+	}
 }
diff --git a/lib/Service/NotesService.php b/lib/Service/NotesService.php
index f73ff0749..9793dd181 100644
--- a/lib/Service/NotesService.php
+++ b/lib/Service/NotesService.php
@@ -7,6 +7,7 @@
 use OCP\Files\File;
 use OCP\Files\FileInfo;
 use OCP\Files\Folder;
+use OCP\Files\NotPermittedException;
 
 class NotesService {
 	private $metaService;
@@ -186,4 +187,60 @@ private static function getFileById(Folder $folder, int $id) : File {
 		}
 		return $file[0];
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 * @return \OCP\Files\File
+	 */
+	public function getAttachment(string $userId, int $noteid, string $path) : File {
+		$note = $this->get($userId, $noteid);
+		$notesFolder = $this->getNotesFolder($userId);
+		$path = str_replace('\\', '/', $path); // change windows style path
+		$p = explode('/', $note->getCategory());
+		// process relative target path
+		foreach (explode('/', $path) as $f) {
+			if ($f == '..') {
+				array_pop($p);
+			} elseif ($f !== '') {
+				array_push($p, $f);
+			}
+		}
+		$targetNode = $notesFolder->get(implode('/', $p));
+		assert($targetNode instanceof \OCP\Files\File);
+		return $targetNode;
+	}
+
+	/**
+	 * @param $userId
+	 * @param $noteid
+	 * @param $fileDataArray
+	 * @throws NotPermittedException
+	 * https://github.com/nextcloud/deck/blob/master/lib/Service/AttachmentService.php
+	 */
+	public function createImage(string $userId, int $noteid, $fileDataArray) {
+		$note = $this->get($userId, $noteid);
+		$notesFolder = $this->getNotesFolder($userId);
+		$parent = $this->noteUtil->getCategoryFolder($notesFolder, $note->getCategory());
+
+		// try to generate long id, if not available on system fall back to a shorter one
+		try {
+			$filename = bin2hex(random_bytes(16));
+		} catch (\Exception $e) {
+			$filename = uniqid();
+		}
+		$filename = $filename . '.' . explode('.', $fileDataArray['name'])[1];
+
+		// read uploaded file from disk
+		$fp = fopen($fileDataArray['tmp_name'], 'r');
+		$content = fread($fp, $fileDataArray['size']);
+		fclose($fp);
+
+		$result = [];
+		$result['filename'] = $filename;
+		$result['filepath'] = $parent->getPath() . '/' . $filename;
+		$result['wasUploaded'] = true;
+
+		$this->noteUtil->getRoot()->newFile($parent->getPath() . '/' . $filename, $content);
+	}
 }
diff --git a/src/components/EditorEasyMDE.vue b/src/components/EditorEasyMDE.vue
index 17ef0f9ba..46b02b34b 100644
--- a/src/components/EditorEasyMDE.vue
+++ b/src/components/EditorEasyMDE.vue
@@ -6,6 +6,9 @@
 <script>
 
 import EasyMDE from 'easymde'
+import axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+import store from '../store'
 
 export default {
 	name: 'EditorEasyMDE',
@@ -19,6 +22,10 @@ export default {
 			type: Boolean,
 			required: true,
 		},
+		noteid: {
+			type: String,
+			required: true,
+		},
 	},
 
 	data() {
@@ -121,6 +128,64 @@ export default {
 			}
 		},
 
+		async onClickSelect() {
+			const apppath = '/' + store.state.app.settings.notesPath
+			const categories = store.getters.getCategories()
+			const currentNotePath = apppath + '/' + categories
+
+			const doc = this.mde.codemirror.getDoc()
+			const cursor = this.mde.codemirror.getCursor()
+			OC.dialogs.filepicker(
+				t('notes', 'Select an image'),
+				(path) => {
+
+					if (!path.startsWith(apppath)) {
+						OC.dialogs.alert(
+							t('notes', 'You cannot select images outside of your notes folder. Your notes folder is: {folder}', { folder: apppath }),
+							t('notes', 'Wrong Image'),
+						)
+						return
+					}
+					const noteLevel = ((currentNotePath + '/').split('/').length) - 1
+					const imageLevel = (path.split('/').length - 1)
+					const upwardsLevel = noteLevel - imageLevel
+					for (let i = 0; i < upwardsLevel; i++) {
+						path = '../' + path
+					}
+					path = path.replace(apppath + '/', '')
+					doc.replaceRange('![' + path + '](' + path + ')', { line: cursor.line })
+				},
+				false,
+				['image/jpeg', 'image/png'],
+				true,
+				OC.dialogs.FILEPICKER_TYPE_CHOOSE,
+				currentNotePath
+			)
+		},
+
+		async onClickUpload() {
+			const doc = this.mde.codemirror.getDoc()
+			const cursor = this.mde.codemirror.getCursor()
+			const id = this.noteid
+
+			const temporaryInput = document.createElement('input')
+			temporaryInput.setAttribute('type', 'file')
+			temporaryInput.onchange = async function() {
+				const data = new FormData()
+				data.append('file', temporaryInput.files[0])
+				const response = await axios({
+					method: 'POST',
+					url: generateUrl('apps/notes') + '/notes/' + id + '/attachment',
+					data,
+				})
+				const name = response.data[0].filename
+				const position = {
+					line: cursor.line,
+				}
+				doc.replaceRange('![' + name + '](' + name + ')', position)
+			}
+			temporaryInput.click()
+		},
 	},
 }
 </script>
diff --git a/src/components/EditorMarkdownIt.vue b/src/components/EditorMarkdownIt.vue
index e3fd31a4e..fe9d0250d 100644
--- a/src/components/EditorMarkdownIt.vue
+++ b/src/components/EditorMarkdownIt.vue
@@ -5,6 +5,7 @@
 <script>
 
 import MarkdownIt from 'markdown-it'
+import { generateUrl } from '@nextcloud/router'
 
 export default {
 	name: 'EditorMarkdownIt',
@@ -14,6 +15,10 @@ export default {
 			type: String,
 			required: true,
 		},
+		noteid: {
+			type: String,
+			required: true,
+		},
 	},
 
 	data() {
@@ -38,6 +43,7 @@ export default {
 	},
 
 	created() {
+		this.setImageRule(this.noteid)
 		this.onUpdate()
 	},
 
@@ -45,6 +51,39 @@ export default {
 		onUpdate() {
 			this.html = this.md.render(this.value)
 		},
+		setImageRule(id) {
+			// https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
+			// Remember old renderer, if overridden, or proxy to default renderer
+			const defaultRender = this.md.renderer.rules.image || function(tokens, idx, options, env, self) {
+				return self.renderToken(tokens, idx, options)
+			}
+
+			this.md.renderer.rules.image = function(tokens, idx, options, env, self) {
+				// If you are sure other plugins can't add `target` - drop check below
+				const token = tokens[idx]
+				const aIndex = token.attrIndex('src')
+				let path = token.attrs[aIndex][1]
+
+				if (!path.startsWith('http')) {
+					path = generateUrl('apps/notes/notes/{id}/attachment?path={path}', { id, path })
+				}
+
+				token.attrs[aIndex][1] = path
+				const lowecasePath = path.toLowerCase()
+				// pass token to default renderer.
+				if (lowecasePath.endsWith('jpg')
+					|| lowecasePath.endsWith('jpeg')
+					|| lowecasePath.endsWith('bmp')
+					|| lowecasePath.endsWith('webp')
+					|| lowecasePath.endsWith('gif')
+					|| lowecasePath.endsWith('png')) {
+					return defaultRender(tokens, idx, options, env, self)
+				} else {
+					const dlimgpath = generateUrl('svg/core/actions/download?color=ffffff')
+					return '<div class="download-file"><a href="' + path.replace(/"/g, '&quot;') + '"><div class="download-icon"><img class="download-icon-inner" src="' + dlimgpath + '">' + token.content + '</div></a></div>'
+				}
+			}
+		},
 	},
 
 }
@@ -145,5 +184,41 @@ export default {
 			cursor: default;
 		}
 	}
+
+	& img {
+		width: 75%;
+		margin-left: auto;
+		margin-right: auto;
+		display: block;
+	}
+
+	.download-file {
+		width: 75%;
+		margin-left: auto;
+		margin-right: auto;
+		display: block;
+		text-align: center;
+	}
+
+	.download-icon {
+		padding: 15px;
+		margin-left: auto;
+		margin-right: auto;
+		width: 75%;
+		border-radius: 10px;
+		background-color: var(--color-background-dark);
+		border: 1px solid transparent; // so that it does not move on hover
+	}
+
+	.download-icon:hover {
+		border: 1px var(--color-primary-element) solid;
+	}
+
+	.download-icon-inner {
+		height: 3em;
+		width: auto;
+		margin-bottom: 5px;
+	}
+
 }
 </style>
diff --git a/src/components/Note.vue b/src/components/Note.vue
index b0f524b42..f04f1d43b 100644
--- a/src/components/Note.vue
+++ b/src/components/Note.vue
@@ -30,9 +30,10 @@
 				<div v-show="!note.content" class="placeholder">
 					{{ preview ? t('notes', 'Empty note') : t('notes', 'Write …') }}
 				</div>
-				<ThePreview v-if="preview" :value="note.content" />
+				<ThePreview v-if="preview" :value="note.content" :noteid="noteId" />
 				<TheEditor v-else
 					:value="note.content"
+					:noteid="noteId"
 					:readonly="note.readonly"
 					@input="onEdit"
 				/>