From 7250bfa1e17980ea11027ff7ea16a132c9d3e346 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 14 Oct 2022 10:56:00 +0200
Subject: [PATCH] Resolve #547

---
 dev/View/Popup/Compose.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index eb6a3f58a..927b5ada8 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1242,25 +1242,25 @@ export class ComposePopupView extends AbstractViewPopup {
 	 */
 	prepareMessageAttachments(message, type) {
 		if (message) {
-			if (ComposeType.ForwardAsAttachment === type) {
-				this.addMessageAsAttachment(message);
-			} else if ([
-				ComposeType.Reply, ComposeType.ReplyAll,
-				ComposeType.Forward, ComposeType.Draft, ComposeType.EditAsNew
-			].includes(type)) {
+			let reply = [ComposeType.Reply, ComposeType.ReplyAll].includes(type);
+			if (reply || [ComposeType.Forward, ComposeType.Draft, ComposeType.EditAsNew].includes(type)) {
 				message.attachments.forEach(item => {
-					const attachment = new ComposeAttachmentModel(
-						item.download,
-						item.fileName,
-						item.estimatedSize,
-						item.isInline(),
-						item.isLinked(),
-						item.cid,
-						item.contentLocation
-					);
-					attachment.fromMessage = true;
-					this.addAttachment(attachment);
+					if (!reply || item.isLinked()) {
+						const attachment = new ComposeAttachmentModel(
+							item.download,
+							item.fileName,
+							item.estimatedSize,
+							item.isInline(),
+							item.isLinked(),
+							item.cid,
+							item.contentLocation
+						);
+						attachment.fromMessage = true;
+						this.addAttachment(attachment);
+					}
 				});
+			} else if (ComposeType.ForwardAsAttachment === type) {
+				this.addMessageAsAttachment(message);
 			}
 		}
 	}