diff --git a/3390/flutter_bootstrap.js b/3390/flutter_bootstrap.js
index 5b97c76288..01f5eeb714 100644
--- a/3390/flutter_bootstrap.js
+++ b/3390/flutter_bootstrap.js
@@ -11,6 +11,6 @@ _flutter.buildConfig = {"engineRevision":"edd8546116457bdf1c5bdfb13ecb9463d2bb5e
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "1429366944"
+    serviceWorkerVersion: "2044869931"
   }
 });
diff --git a/3390/flutter_service_worker.js b/3390/flutter_service_worker.js
index 3a661bfdc2..2abf5bcda5 100644
--- a/3390/flutter_service_worker.js
+++ b/3390/flutter_service_worker.js
@@ -328,8 +328,8 @@ const RESOURCES = {"icons/Icon-maskable-192.png": "009a8eae32218365ab20cce81aa89
 "splash/splash.js": "123c400b58bea74c1305ca3ac966748d",
 "main.dart.js_8.part.js": "82411a44c43afd84ff221abf68d10929",
 "main.dart.js_2.part.js": "4c449137f08e74db8c621402701afd3c",
-"index.html": "c2490b816ce11d7d9c9feb37a62fd218",
-"/": "c2490b816ce11d7d9c9feb37a62fd218",
+"index.html": "a26f41a1c6e242318b4ee28c166ea95b",
+"/": "a26f41a1c6e242318b4ee28c166ea95b",
 "main.dart.js_1.part.js": "b1610d13945fa953c43587da92d1a352",
 "favicon.svg": "1734d2c8d930abd57ebba9c158506714",
 "main.dart.js_6.part.js": "4c344e180fa47a08373c5b10641c863a",
@@ -342,7 +342,7 @@ const RESOURCES = {"icons/Icon-maskable-192.png": "009a8eae32218365ab20cce81aa89
 "login-callback.html": "e17f83d4982ea3cce6e692b31c4b4beb",
 "logout-callback.html": "999326dc9a0f37c9a9a4280b4a35dc51",
 "main.dart.js_7.part.js": "0eab51ea07259044f9d690aad07364bd",
-"flutter_bootstrap.js": "fd068bcdc71784f36072342502035326",
+"flutter_bootstrap.js": "e37b0116f973f4b34510fdefbe3f5483",
 "worker_service/img/ic-close-1x.png": "27b9c71ff0cf463da5f1affb11b4c204",
 "worker_service/img/tmail-3x.png": "7b5f8e671c4f39ae5d1a67b46fe494d7",
 "worker_service/img/tmail-2x.png": "55f91555db37edb9ed0608f7ee3f37ee",
@@ -355,7 +355,7 @@ const RESOURCES = {"icons/Icon-maskable-192.png": "009a8eae32218365ab20cce81aa89
 "worker_service/style.css": "3ec186c93eb7bdab17e882de738e3123",
 "main.dart.js_4.part.js": "992e515b8c62b12a667e531e09431e53",
 "main.dart.js_5.part.js": "59d55c48067e9c937a508b9706e04200",
-"main.dart.js": "a719e1c6b224254f599d4b491715f1f6",
+"main.dart.js": "1d8f96a85bc0fc5e39b4970a5b560e93",
 "main.dart.js_3.part.js": "69ec72afffb27201a73d9811892bedbc"};
 // The application shell files that are downloaded before a service worker can
 // start.
diff --git a/3390/index.html b/3390/index.html
index a05b4ef0cc..92bcedb2e9 100644
--- a/3390/index.html
+++ b/3390/index.html
@@ -114,7 +114,7 @@
 
     _flutter.loader.load({
       serviceWorkerSettings: {
-        serviceWorkerVersion: "1429366944",
+        serviceWorkerVersion: "2044869931",
       },
       onEntrypointLoaded: async function(engineInitializer) {
         const appRunner = await engineInitializer.initializeEngine();
diff --git a/3390/main.dart.js b/3390/main.dart.js
index ef1ae9596d..814dad0b38 100644
--- a/3390/main.dart.js
+++ b/3390/main.dart.js
@@ -353854,18 +353854,14 @@
       _this.super$BaseController$handleSuccessViewState(success);
       if (success instanceof A.GetEmailContentSuccess)
         _this._getEmailContentSuccess$1(success);
-      else if (success instanceof A.MarkAsEmailReadSuccess) {
-        if (success.readActions === B.ReadActions_1) {
-          $.$get$Get();
-          t1 = $.$get$GetNavigation__getxController()._root_controller$_key;
-          _this.closeEmailView$1$context($.WidgetsBinding__instance.WidgetsBinding__buildOwner._globalKeyRegistry.$index(0, t1));
-        }
-      } else if (success instanceof A.MoveToMailboxSuccess)
+      else if (success instanceof A.MarkAsEmailReadSuccess)
+        _this._handleMarkAsEmailReadCompleted$1(success.readActions);
+      else if (success instanceof A.MoveToMailboxSuccess)
         _this._single_email_controller$_moveToMailboxSuccess$1(success);
       else if (success instanceof A.MarkAsStarEmailSuccess) {
         t1 = _this.mailboxDashBoardController.selectedEmail;
         t2 = t1.get$value(0);
-        newEmail = t2 == null ? _null : A.PresentationEmailExtension_updateKeywords(t2, A.LinkedHashMap_LinkedHashMap$_literal([$.$get$KeyWordIdentifier_emailFlagged(), true], type$.KeyWordIdentifier, type$.bool));
+        newEmail = t2 == null ? _null : A.PresentationEmailExtension_updateKeywords(t2, A.LinkedHashMap_LinkedHashMap$_literal([$.$get$KeyWordIdentifier_emailFlagged(), success.markStarAction === B.MarkStarAction_0], type$.KeyWordIdentifier, type$.bool));
         A.log(string$.Mailbos + A.S(newEmail), B.Level_3);
         t1.set$value(0, newEmail);
       } else if (success instanceof A.DownloadAttachmentForWebSuccess) {
@@ -353930,13 +353926,9 @@
     handleFailureViewState$1(failure) {
       var t1, t2, t3, _this = this, _null = null;
       _this.super$BaseController$handleFailureViewState(failure);
-      if (failure instanceof A.MarkAsEmailReadFailure) {
-        if (failure.readActions === B.ReadActions_1) {
-          $.$get$Get();
-          t1 = $.$get$GetNavigation__getxController()._root_controller$_key;
-          _this.closeEmailView$1$context($.WidgetsBinding__instance.WidgetsBinding__buildOwner._globalKeyRegistry.$index(0, t1));
-        }
-      } else if (failure instanceof A.DownloadAttachmentForWebFailure) {
+      if (failure instanceof A.MarkAsEmailReadFailure)
+        _this._handleMarkAsEmailReadCompleted$1(failure.readActions);
+      else if (failure instanceof A.DownloadAttachmentForWebFailure) {
         A.log("SingleEmailController::_downloadAttachmentForWebFailureAction(): " + failure.toString$0(0), B.Level_3);
         t1 = failure.taskId;
         if (t1 != null)
@@ -354270,6 +354262,16 @@
         this.consumeState$1(this._single_email_controller$_markAsEmailReadInteractor.execute$6(t1, t2, t3, readActions, markReadAction, t4));
       }
     },
+    _handleMarkAsEmailReadCompleted$1(readActions) {
+      var t1 = this._currentEmailId;
+      if (t1 != null)
+        A.UpdateCurrentEmailsFlagsExtension_updateEmailFlagByEmailIds(this.mailboxDashBoardController, A._setArrayType([t1], type$.JSArray_EmailId), null, B.ReadActions_0);
+      if (readActions === B.ReadActions_1) {
+        $.$get$Get();
+        t1 = $.$get$GetNavigation__getxController()._root_controller$_key;
+        this.closeEmailView$1$context($.WidgetsBinding__instance.WidgetsBinding__buildOwner._globalKeyRegistry.$index(0, t1));
+      }
+    },
     downloadAttachmentForWeb$1(attachment) {
       var baseDownloadUrl, _this = this,
         t1 = _this.mailboxDashBoardController,