From 30ed8dde11e2bb8d58f3b8970bf2ccd8bd5014d0 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 12 Jan 2024 01:56:12 +0100
Subject: [PATCH] Resolve #1381

---
 dev/Model/Message.js            | 2 +-
 dev/View/Popup/Compose.js       | 9 +++++----
 plugins/nextcloud/js/message.js | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 79b4149cd..8a85626f5 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -187,7 +187,7 @@ export class MessageModel extends AbstractModel {
 			folder: this.folder,
 			uid: this.uid,
 			mimeType: RFC822,
-			fileName: (this.subject() || 'message-' + this.hash) + '.eml',
+			fileName: (this.subject() || 'message') + '-' + this.hash + '.eml',
 			accountHash: SettingsGet('accountHash')
 		});
 	}
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 7959727a0..465955c61 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1187,10 +1187,11 @@ export class ComposePopupView extends AbstractViewPopup {
 	 */
 	addMessageAsAttachment(message) {
 		if (message) {
-			let temp = message.subject();
-			temp = '.eml' === temp.slice(-4).toLowerCase() ? temp : temp + '.eml';
-
-			const attachment = new ComposeAttachmentModel(message.requestHash, temp, message.size());
+			const attachment = new ComposeAttachmentModel(
+				message.requestHash,
+				message.subject() /*+ '-' + Jua.randomId()*/ + '.eml',
+				message.size()
+			);
 			attachment.fromMessage = true;
 			attachment.complete(true);
 			this.addAttachment(attachment);
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index f5154b745..2d5d8734f 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -100,7 +100,7 @@
 						{
 							'msgHash': msg.requestHash,
 							'folder': folder,
-							'filename': msg.subject()
+							'filename': msg.subject() + '-' + msg.requestHash
 						}
 					);
 				});