From a019f4d80e090e0caff88abe3e3067beaa3fef73 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 13 Mar 2023 12:59:16 +0100
Subject: [PATCH] Reset folder etag on draft send

---
 dev/View/Popup/Compose.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 6d46b5425..53ec466c1 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -440,16 +440,7 @@ export class ComposePopupView extends AbstractViewPopup {
 			} else try {
 				this.sendError(false);
 				this.sending(true);
-/*
-				if (3 === arrayLength(this.aDraftInfo)) {
-					const flagsCache = MessageFlagsCache.getFor(this.aDraftInfo[2], this.aDraftInfo[1]);
-					if (isArray(flagsCache)) {
-						flagsCache.push(('forward' === this.aDraftInfo[0]) ? '$forwarded' : '\\answered');
-						MessageFlagsCache.setFor(this.aDraftInfo[2], this.aDraftInfo[1], flagsCache);
-						setFolderETag(this.aDraftInfo[2], '');
-					}
-				}
-*/
+
 				sSentFolder = UNUSED_OPTION_VALUE === sSentFolder ? '' : sSentFolder;
 
 				this.getMessageRequestParams(sSentFolder).then(params => {
@@ -470,6 +461,10 @@ export class ComposePopupView extends AbstractViewPopup {
 							}
 							setFolderETag(this.draftsFolder(), '');
 							setFolderETag(sSentFolder, '');
+							if (3 === arrayLength(this.aDraftInfo)) {
+								const folder = this.aDraftInfo[2];
+								setFolderETag(folder, '');
+							}
 							reloadDraftFolder();
 						},
 						params,