Resolve #1381

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')
 		});
 	}

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);

plugins/nextcloud/js/message.js

@@ -100,7 +100,7 @@
 						{
 							'msgHash': msg.requestHash,
 							'folder': folder,
-							'filename': msg.subject()
+							'filename': msg.subject() + '-' + msg.requestHash
 						}
 					);
 				});