diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php
index 344c60a39a5..a50ec7b67fe 100644
--- a/lib/Service/AttachmentService.php
+++ b/lib/Service/AttachmentService.php
@@ -251,17 +251,14 @@ public function getAttachmentList(int $documentId, ?string $userId = null, ?Sess
 				'mimetype' => $node->getMimeType(),
 				'mtime' => $node->getMTime(),
 				'isImage' => $isImage,
+				'shareToken' => $shareToken,
+				'davPath' => '/' . implode('/', array_slice(explode('/', $node->getPath()), 3)),
 				'fullUrl' => $isImage
 					? $this->urlGenerator->linkToRouteAbsolute('text.Attachment.getImageFile') . $urlParamsBase . '&imageFileName=' . urlencode($name) . '&preferRawImage=1'
 					: $this->urlGenerator->linkToRouteAbsolute('text.Attachment.getMediaFile') . $urlParamsBase . '&mediaFileName=' . urlencode($name),
 				'previewUrl' => $isImage
 					? $this->urlGenerator->linkToRouteAbsolute('text.Attachment.getImageFile') . $urlParamsBase . '&imageFileName=' . urlencode($name)
 					: $this->urlGenerator->linkToRouteAbsolute('text.Attachment.getMediaFilePreview') . $urlParamsBase . '&mediaFileName=' . urlencode($name),
-				/*
-					: ($isImage
-						? $this->urlGenerator->linkTo('', 'remote.php') . '/dav/files/' . $userId . '/' . implode('/', array_map('rawurlencode', array_slice(explode('/', $node->getPath()), 3)))
-						: ''),
-				*/
 			];
 		}
 
diff --git a/src/nodes/ImageView.vue b/src/nodes/ImageView.vue
index ff9484876d7..24da8be643a 100644
--- a/src/nodes/ImageView.vue
+++ b/src/nodes/ImageView.vue
@@ -36,7 +36,7 @@
 						<div v-if="isMediaAttachment"
 							contenteditable="false"
 							class="media"
-							@click="handleImageClick">
+							@click="handleAttachmentClick">
 							<div class="media__wrapper">
 								<img v-show="loaded"
 									:src="imageUrl"
@@ -201,14 +201,6 @@ export default {
 
 			return this.loaded && this.imageLoaded
 		},
-		/*
-		internalLinkOrImage() {
-			if (this.attachment.fileId) {
-				return generateUrl('/f/' + this.attachment.fileId)
-			}
-			return this.src
-		},
-		 */
 		src: {
 			get() {
 				return this.node.attrs.src || ''
@@ -277,6 +269,25 @@ export default {
 		onLoaded() {
 			this.loaded = true
 		},
+		async handleAttachmentClick() {
+			// Open in viewer if possible
+			if (OCA.Viewer
+				// Viewer is not in use
+				&& !OCA.Viewer.file
+				// Viewer supports mimetype
+				&& OCA.Viewer.mimetypes.indexOf(this.attachment.mimetype) !== -1
+				// Attachment has davPath (i.e. is native attachment)
+				&& this.attachment.davPath
+				// Not in share (in public share we probably don't have DAV access)
+				&& !this.attachment.shareToken) {
+				// Viewer exists, is not in use and supports mimetype
+				OCA.Viewer.open({ path: this.attachment.davPath })
+				return
+			}
+
+			// Download file
+			window.location.assign(this.attachment.fullUrl)
+		},
 		async handleImageClick() {
 			this.imageIndex = this.imageAttachments.findIndex(i => (i.isImage && i.fileId === this.attachment.fileId))
 			if (this.imageIndex !== -1) {
diff --git a/src/services/AttachmentResolver.js b/src/services/AttachmentResolver.js
index 85d5513d71a..704422b2e2d 100644
--- a/src/services/AttachmentResolver.js
+++ b/src/services/AttachmentResolver.js
@@ -76,7 +76,10 @@ export default class AttachmentResolver {
 				attachment = findAttachment(imageFileName)
 			}
 
-			return attachment
+			if (attachment) {
+				return attachment
+			}
+
 		}
 
 		// Direct URLs