diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 183e5b831..e1557d268 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -493,6 +493,19 @@ export class ComposePopupView extends AbstractViewPopup {
 										|| getNotification(Notifications.CantSendMessage));
 								}
 							} else {
+								if (arrayLength(this.aDraftInfo) > 0) {
+									const flag = {
+										'reply': '\\answered',
+										'forward': '$forwarded'
+									}[this.aDraftInfo[0]];
+									if (flag) {
+										const aFlags = MessageUserStore.message().flags();
+										if (aFlags.indexOf(flag) === -1) {
+											aFlags.push(flag);
+											MessageUserStore.message().flags(aFlags);
+										}
+									}
+								}
 								this.close();
 							}
 							setFolderETag(this.draftsFolder(), '');