TF-1767 Fix Reply/Forward original message should be marked, not the sent one

(cherry picked from commit 827c6537cbad268dac4860fb0c57714811ed44e1)

model/lib/extensions/keyword_identifier_extension.dart

@@ -19,4 +19,16 @@ extension KeyWordIdentifierExtension on KeyWordIdentifier {
       generatePath(): markStarAction == MarkStarAction.markStar ? true : null
     });
   }
+
+  PatchObject generateAnsweredActionPath() {
+    return PatchObject({
+      generatePath(): true
+    });
+  }
+
+  PatchObject generateForwardedActionPath() {
+    return PatchObject({
+      generatePath(): true
+    });
+  }
 }

model/lib/extensions/list_email_id_extension.dart

@@ -10,34 +10,44 @@ extension ListEmailIdExtension on List<EmailId> {
   List<Id> toIds() => map((emailId) => emailId.id).toList();
 
   Map<Id, PatchObject> generateMapUpdateObjectMarkAsRead(ReadActions readActions) {
-    final Map<Id, PatchObject> maps = {};
-    forEach((emailId) {
-      maps[emailId.id] = KeyWordIdentifier.emailSeen.generateReadActionPath(readActions);
-    });
-    return maps;
+    return {
+      for (var emailId in this)
+        emailId.id: KeyWordIdentifier.emailSeen.generateReadActionPath(readActions)
+    };
   }
 
   Map<Id, PatchObject> generateMapUpdateObjectMoveToMailbox(MailboxId currentMailboxId, MailboxId destinationMailboxId) {
-    final Map<Id, PatchObject> maps = {};
-    forEach((emailId) {
-      maps[emailId.id] = currentMailboxId.generateMoveToMailboxActionPath(destinationMailboxId);
-    });
-    return maps;
+    return {
+      for (var emailId in this)
+        emailId.id: currentMailboxId.generateMoveToMailboxActionPath(destinationMailboxId)
+    };
   }
 
   Map<Id, PatchObject> generateMapUpdateObjectMarkAsStar(MarkStarAction markStarAction) {
-    final Map<Id, PatchObject> maps = {};
-    forEach((emailId) {
-      maps[emailId.id] = KeyWordIdentifier.emailFlagged.generateMarkStarActionPath(markStarAction);
-    });
-    return maps;
+    return {
+      for (var emailId in this)
+        emailId.id: KeyWordIdentifier.emailFlagged.generateMarkStarActionPath(markStarAction)
+    };
   }
 
   Map<Id, PatchObject> generateMapUpdateObjectMarkAsSpam(MailboxId spamMailboxId) {
-    final Map<Id, PatchObject> maps = {};
-    forEach((emailId) {
-      maps[emailId.id] = spamMailboxId.generateActionPath();
-    });
-    return maps;
+    return {
+      for (var emailId in this)
+        emailId.id: spamMailboxId.generateActionPath()
+    };
+  }
+
+  Map<Id, PatchObject> generateMapUpdateObjectMarkAsAnswered() {
+    return {
+      for (var emailId in this)
+        emailId.id: KeyWordIdentifier.emailAnswered.generateAnsweredActionPath()
+    };
+  }
+
+  Map<Id, PatchObject> generateMapUpdateObjectMarkAsForwarded() {
+    return {
+      for (var emailId in this)
+        emailId.id: KeyWordIdentifier.emailForwarded.generateForwardedActionPath()
+    };
   }
 }