From f9d91c38bd4ecc88b4ef9da9648d76b83f01c2e4 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 6 Jun 2024 15:01:03 +0800
Subject: [PATCH 01/78] wip: Ui improvemnts

---
 extension/chrome/settings/inbox/inbox.htm | 6 ++++--
 extension/chrome/settings/inbox/inbox.ts  | 3 +++
 extension/chrome/settings/initial.ts      | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/extension/chrome/settings/inbox/inbox.htm b/extension/chrome/settings/inbox/inbox.htm
index a8c0b61a7d8..f11593a770b 100644
--- a/extension/chrome/settings/inbox/inbox.htm
+++ b/extension/chrome/settings/inbox/inbox.htm
@@ -17,8 +17,10 @@
 
   <body id="settings" class="client">
     <div class="line header" id="banner">
-      This page has limited functionality. Using FlowCrypt directly in Gmail is more convenient:
-      <a href="https://mail.google.com/" class="action_open_webmail">Open Gmail</a>
+      <div id="container-gmail-banner">
+        This page has limited functionality. Using FlowCrypt directly in Gmail is more convenient:
+        <a href="https://mail.google.com/" class="action_open_webmail">Open Gmail</a>
+      </div>
 
       <img src="/img/svgs/profile-icon.svg" class="action_choose_account action-toggle-accounts-menu profile-img main-profile-img" alt="Profile Image" />
       <img src="/img/svgs/settings-icon.svg" class="action_open_settings" alt="Settings" title="Open FlowCrypt Settings" />
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 3fa5f8baf9c..fe84a0bf460 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -72,6 +72,9 @@ export class InboxView extends View {
     ({ email_provider: emailProvider, picture: this.picture } = await AcctStore.get(this.acctEmail, ['email_provider', 'picture']));
     this.messageRenderer = await MessageRenderer.newInstance(this.acctEmail, this.gmail, this.relayManager, this.factory, this.debug);
     this.inboxNotificationModule.render();
+    if (Catch.browser().name === 'thunderbird') {
+      $('#container-gmail-banner').hide();
+    }
     try {
       await Settings.populateAccountsMenu('inbox.htm');
       if (emailProvider && emailProvider !== 'gmail') {
diff --git a/extension/chrome/settings/initial.ts b/extension/chrome/settings/initial.ts
index 4895ad61d28..8e9c39a8436 100644
--- a/extension/chrome/settings/initial.ts
+++ b/extension/chrome/settings/initial.ts
@@ -11,6 +11,7 @@ View.run(
       const browserName = Catch.browser().name === 'chrome' && Number(Catch.browser().v) >= 76 ? 'chrome' : Catch.browser().name;
       if (browserName === 'thunderbird') {
         $('#img-setup-arrow').hide();
+        $('#thunderbird-steps').parent().parent().css('text-align', 'center');
       }
       const stepsEl = document.getElementById(`${browserName}-steps`);
       if (stepsEl) {

From 1b36406df13df2598862c9369d98d63f134e708a Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 6 Jun 2024 17:12:30 +0800
Subject: [PATCH 02/78] wip: Enable fullscreen mode on compose startup

---
 extension/chrome/settings/inbox/inbox.ts |  7 ++++++-
 extension/js/common/inject.ts            | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index fe84a0bf460..5ccd9572ab6 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -36,6 +36,7 @@ export class InboxView extends View {
   public readonly threadId: string | undefined;
   public readonly showOriginal: boolean;
   public readonly debug: boolean;
+  public readonly isFullScreenSecureCompose: boolean;
   public readonly S: SelCache;
   public readonly gmail: Gmail;
 
@@ -49,12 +50,13 @@ export class InboxView extends View {
 
   public constructor() {
     super();
-    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug']);
+    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'isFullScreenSecureCompose']);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.labelId = uncheckedUrlParams.labelId ? String(uncheckedUrlParams.labelId) : 'INBOX';
     this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId');
     this.showOriginal = uncheckedUrlParams.showOriginal === true;
     this.debug = uncheckedUrlParams.debug === true;
+    this.isFullScreenSecureCompose = uncheckedUrlParams.isFullScreenSecureCompose === true;
     this.S = Ui.buildJquerySels({ threads: '.threads', thread: '.thread', body: 'body' });
     this.gmail = new Gmail(this.acctEmail);
     this.inboxMenuModule = new InboxMenuModule(this);
@@ -74,6 +76,9 @@ export class InboxView extends View {
     this.inboxNotificationModule.render();
     if (Catch.browser().name === 'thunderbird') {
       $('#container-gmail-banner').hide();
+      if (this.isFullScreenSecureCompose) {
+        this.injector.openComposeWin(undefined, true);
+      }
     }
     try {
       await Settings.populateAccountsMenu('inbox.htm');
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index c2aa2ec1a66..c8435e99cfd 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -62,12 +62,22 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (draftId?: string): boolean => {
+  public openComposeWin = (draftId?: string, fullscreen = false): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
       const composeWin = $(this.factory.embeddedCompose(draftId));
       composeWin.attr('data-order', alreadyOpenedCount + 1);
       this.S.cached('body').append(composeWin); // xss-safe-factory
+      if (fullscreen) {
+        const composeFrameId = this.S.cached('secure_compose_window').attr('data-frame-id') || '';
+        $(`#${composeFrameId}`).on('load', () => {
+          const composeIframe = document.getElementById(composeFrameId) as HTMLIFrameElement;
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          const composeIframeDoc = composeIframe!.contentWindow!.document;
+          $(composeIframeDoc.body).addClass('full_window');
+        });
+        this.S.cached('secure_compose_window').addClass('active full_window');
+      }
       return true;
     } else {
       Ui.toast('Only 3 FlowCrypt windows can be opened at a time', false, 3, 'top', 'error');

From 1543840ff2e78619bf01a7619784858ef1d56782 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 6 Jun 2024 19:01:30 +0800
Subject: [PATCH 03/78] wip: Add currentPage http parameters when opening
 Settings page (for fullscreen compose)

---
 extension/chrome/popups/select_account.ts |  3 ++-
 extension/js/common/browser/browser.ts    | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index 55e53d9c8c7..f57f75dfcec 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -56,8 +56,9 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
+      const isFullScreenSecureCompose = Catch.browser().name === 'thunderbird' ? true : false;
       if (this.action === 'inbox') {
-        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'));
+        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, undefined, false, { isFullScreenSecureCompose });
       } else {
         await Browser.openSettingsPage('index.htm', $(clickedElement).attr('email'));
       }
diff --git a/extension/js/common/browser/browser.ts b/extension/js/common/browser/browser.ts
index cd22fa31225..0277c219343 100644
--- a/extension/js/common/browser/browser.ts
+++ b/extension/js/common/browser/browser.ts
@@ -53,16 +53,23 @@ export class Browser {
     return array;
   };
 
-  public static openSettingsPage = async (path = 'index.htm', acctEmail?: string, page = '', rawPageUrlParams?: Dict<UrlParam>, addNewAcct = false) => {
+  public static openSettingsPage = async (
+    path = 'index.htm',
+    acctEmail?: string,
+    page = '',
+    rawPageUrlParams?: Dict<UrlParam>,
+    addNewAcct = false,
+    currentPageParams?: Dict<UrlParam>
+  ) => {
     const basePath = chrome.runtime.getURL(`chrome/settings/${path}`);
     const pageUrlParams = rawPageUrlParams ? JSON.stringify(rawPageUrlParams) : undefined;
     if (acctEmail || path === 'fatal.htm') {
-      await Browser.openExtensionTab(Url.create(basePath, { acctEmail, page, pageUrlParams }));
+      await Browser.openExtensionTab(Url.create(basePath, { acctEmail, page, pageUrlParams, ...currentPageParams }));
     } else if (addNewAcct) {
       await Browser.openExtensionTab(Url.create(basePath, { addNewAcct }));
     } else {
       const acctEmails = await GlobalStore.acctEmailsGet();
-      await Browser.openExtensionTab(Url.create(basePath, { acctEmail: acctEmails[0], page, pageUrlParams }));
+      await Browser.openExtensionTab(Url.create(basePath, { acctEmail: acctEmails[0], page, pageUrlParams, ...currentPageParams }));
     }
   };
 

From a7e6915b1410ce8ee40a68a548ca0e819fb66224 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 6 Jun 2024 19:17:55 +0800
Subject: [PATCH 04/78] wip: Add Thunderbird API type definitions

---
 extension/js/common/browser/browser-msg.ts | 3 +++
 package-lock.json                          | 7 +++++++
 package.json                               | 1 +
 3 files changed, 11 insertions(+)

diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 4458b5641c0..cb3e2fd2540 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -1,5 +1,8 @@
 /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */
 
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="../../../../node_modules/@types/thunderbird-webext-browser/index.d.ts" />
+
 'use strict';
 
 import { AuthRes } from '../api/authentication/google/google-oauth.js';
diff --git a/package-lock.json b/package-lock.json
index d62149500fc..dcab0d6dbd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "license": "SEE LICENSE IN <LICENSE>",
       "dependencies": {
         "@flowcrypt/fine-uploader": "5.16.4",
+        "@types/thunderbird-webext-browser": "^109.0.4",
         "bootstrap": "4.6.2",
         "clipboard": "2.0.11",
         "dompurify": "3.1.5",
@@ -1142,6 +1143,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/thunderbird-webext-browser": {
+      "version": "109.0.4",
+      "resolved": "https://registry.npmjs.org/@types/thunderbird-webext-browser/-/thunderbird-webext-browser-109.0.4.tgz",
+      "integrity": "sha512-X4ao1F1vXxST1AC4/woVlK/OIwbdr5VLKJYnryk/lyvOCuunOSOfJhZ43fnuKVqaYCk/RlMpbTcjX5wboDUn3w==",
+      "license": "MIT"
+    },
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
diff --git a/package.json b/package.json
index 1b0470a5025..abd8fd57abb 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "@flowcrypt/fine-uploader": "5.16.4",
+    "@types/thunderbird-webext-browser": "^109.0.4",
     "bootstrap": "4.6.2",
     "clipboard": "2.0.11",
     "dompurify": "3.1.5",

From 89dae3013dda5c87fe7a5802fa707e266cde82fc Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 7 Jun 2024 19:46:09 +0800
Subject: [PATCH 05/78] wip

---
 extension/chrome/popups/select_account.ts | 4 ++--
 extension/chrome/settings/inbox/inbox.ts  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index f57f75dfcec..bba3077a96a 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -56,9 +56,9 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
-      const isFullScreenSecureCompose = Catch.browser().name === 'thunderbird' ? true : false;
+      const useFullScreenSecureCompose = Catch.browser().name === 'thunderbird' ? true : false;
       if (this.action === 'inbox') {
-        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, undefined, false, { isFullScreenSecureCompose });
+        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, undefined, false, { useFullScreenSecureCompose });
       } else {
         await Browser.openSettingsPage('index.htm', $(clickedElement).attr('email'));
       }
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 5ccd9572ab6..798d86436ef 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -36,7 +36,7 @@ export class InboxView extends View {
   public readonly threadId: string | undefined;
   public readonly showOriginal: boolean;
   public readonly debug: boolean;
-  public readonly isFullScreenSecureCompose: boolean;
+  public readonly useFullScreenSecureCompose: boolean;
   public readonly S: SelCache;
   public readonly gmail: Gmail;
 
@@ -50,13 +50,13 @@ export class InboxView extends View {
 
   public constructor() {
     super();
-    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'isFullScreenSecureCompose']);
+    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'useFullScreenSecureCompose']);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.labelId = uncheckedUrlParams.labelId ? String(uncheckedUrlParams.labelId) : 'INBOX';
     this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId');
     this.showOriginal = uncheckedUrlParams.showOriginal === true;
     this.debug = uncheckedUrlParams.debug === true;
-    this.isFullScreenSecureCompose = uncheckedUrlParams.isFullScreenSecureCompose === true;
+    this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
     this.S = Ui.buildJquerySels({ threads: '.threads', thread: '.thread', body: 'body' });
     this.gmail = new Gmail(this.acctEmail);
     this.inboxMenuModule = new InboxMenuModule(this);
@@ -76,7 +76,7 @@ export class InboxView extends View {
     this.inboxNotificationModule.render();
     if (Catch.browser().name === 'thunderbird') {
       $('#container-gmail-banner').hide();
-      if (this.isFullScreenSecureCompose) {
+      if (this.useFullScreenSecureCompose) {
         this.injector.openComposeWin(undefined, true);
       }
     }

From d977395d1e3848c830f02695a9f19c5726129014 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 7 Jun 2024 19:52:34 +0800
Subject: [PATCH 06/78] wip

---
 extension/chrome/popups/select_account.ts | 2 +-
 extension/chrome/settings/inbox/inbox.ts  | 2 +-
 extension/js/common/browser/browser.ts    | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index bba3077a96a..e6ae5b1e720 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -56,7 +56,7 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
-      const useFullScreenSecureCompose = Catch.browser().name === 'thunderbird' ? true : false;
+      const useFullScreenSecureCompose = Browser.isThunderbirdMail() ? true : false;
       if (this.action === 'inbox') {
         await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, undefined, false, { useFullScreenSecureCompose });
       } else {
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 798d86436ef..0015514409d 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -74,7 +74,7 @@ export class InboxView extends View {
     ({ email_provider: emailProvider, picture: this.picture } = await AcctStore.get(this.acctEmail, ['email_provider', 'picture']));
     this.messageRenderer = await MessageRenderer.newInstance(this.acctEmail, this.gmail, this.relayManager, this.factory, this.debug);
     this.inboxNotificationModule.render();
-    if (Catch.browser().name === 'thunderbird') {
+    if (Browser.isThunderbirdMail()) {
       $('#container-gmail-banner').hide();
       if (this.useFullScreenSecureCompose) {
         this.injector.openComposeWin(undefined, true);
diff --git a/extension/js/common/browser/browser.ts b/extension/js/common/browser/browser.ts
index 0277c219343..4e969972c54 100644
--- a/extension/js/common/browser/browser.ts
+++ b/extension/js/common/browser/browser.ts
@@ -16,6 +16,10 @@ export class Browser {
     return URL.createObjectURL(new Blob([content], { type: 'application/octet-stream' }));
   };
 
+  public static isThunderbirdMail = () => {
+    return Catch.browser().name === 'thunderbird';
+  };
+
   public static saveToDownloads = (attachment: Attachment) => {
     const blob = new Blob([attachment.getData()], { type: attachment.type });
     const a = window.document.createElement('a');
@@ -74,7 +78,7 @@ export class Browser {
   };
 
   public static openExtensionTab = async (url: string) => {
-    if (Catch.browser().name === 'thunderbird') {
+    if (Browser.isThunderbirdMail()) {
       await BgUtils.openExtensionTab(url);
     } else {
       const tab = window.open(url, 'flowcrypt');

From 9b0df5641f43d4c143154dd7e364ad63deeee81a Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 7 Jun 2024 19:55:57 +0800
Subject: [PATCH 07/78] wip

---
 extension/chrome/popups/default.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/chrome/popups/default.ts b/extension/chrome/popups/default.ts
index 11114122a61..89c868c2f25 100644
--- a/extension/chrome/popups/default.ts
+++ b/extension/chrome/popups/default.ts
@@ -58,6 +58,9 @@ View.run(
     };
 
     private renderChooseEmailOrSettingsPopup = (activeAcctEmail?: string) => {
+      if (Browser.isThunderbirdMail()) {
+        $('.action_open_encrypted_inbox').text('Secure Compose');
+      }
       $('#email_or_settings').css('display', 'block');
       $('.action_open_settings').on(
         'click',

From dec8f097329eb1ebd31d56a67372d5bed4c42a29 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Sat, 8 Jun 2024 10:25:52 +0800
Subject: [PATCH 08/78] Pr review: apply simplification

---
 extension/chrome/popups/select_account.ts | 2 +-
 tooling/build-types-and-manifests.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index e6ae5b1e720..82d9bfd5892 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -56,7 +56,7 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
-      const useFullScreenSecureCompose = Browser.isThunderbirdMail() ? true : false;
+      const useFullScreenSecureCompose = Browser.isThunderbirdMail();
       if (this.action === 'inbox') {
         await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, undefined, false, { useFullScreenSecureCompose });
       } else {
diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts
index d613e94efe1..43f36ea1299 100644
--- a/tooling/build-types-and-manifests.ts
+++ b/tooling/build-types-and-manifests.ts
@@ -53,7 +53,7 @@ addManifest(
   'thunderbird-consumer',
   manifest => {
     manifest.browser_specific_settings.strict_min_version = '102.0';
-    manifest.browser_action.default_title = 'FlowCrypt Encryption for Thunderbird';
+    manifest.browser_action.default_title = 'FlowCrypt';
     manifest.name = 'FlowCrypt Encryption for Thunderbird';
     manifest.description = 'Secure end-to-end encryption with FlowCrypt'; // needs to updated later
     manifest.compose_action = {

From de39851c25a240f8d9bdf0df27e631a0d15a9eb5 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 11 Jun 2024 18:45:47 +0800
Subject: [PATCH 09/78] Pr review: use rawPageUrlParams

---
 extension/chrome/popups/select_account.ts |  2 +-
 extension/chrome/settings/inbox/inbox.ts  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index 82d9bfd5892..7ab763e963c 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -58,7 +58,7 @@ View.run(
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
       const useFullScreenSecureCompose = Browser.isThunderbirdMail();
       if (this.action === 'inbox') {
-        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, undefined, false, { useFullScreenSecureCompose });
+        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, { useFullScreenSecureCompose });
       } else {
         await Browser.openSettingsPage('index.htm', $(clickedElement).attr('email'));
       }
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 0015514409d..c792151dca7 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -36,7 +36,9 @@ export class InboxView extends View {
   public readonly threadId: string | undefined;
   public readonly showOriginal: boolean;
   public readonly debug: boolean;
-  public readonly useFullScreenSecureCompose: boolean;
+  public pageUrlParams: {
+    useFullScreenSecureCompose: string;
+  };
   public readonly S: SelCache;
   public readonly gmail: Gmail;
 
@@ -50,13 +52,13 @@ export class InboxView extends View {
 
   public constructor() {
     super();
-    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'useFullScreenSecureCompose']);
+    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'pageUrlParams']);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.labelId = uncheckedUrlParams.labelId ? String(uncheckedUrlParams.labelId) : 'INBOX';
     this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId');
     this.showOriginal = uncheckedUrlParams.showOriginal === true;
     this.debug = uncheckedUrlParams.debug === true;
-    this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
+    this.pageUrlParams = JSON.parse(Assert.urlParamRequire.string(uncheckedUrlParams, 'pageUrlParams'));
     this.S = Ui.buildJquerySels({ threads: '.threads', thread: '.thread', body: 'body' });
     this.gmail = new Gmail(this.acctEmail);
     this.inboxMenuModule = new InboxMenuModule(this);
@@ -76,7 +78,7 @@ export class InboxView extends View {
     this.inboxNotificationModule.render();
     if (Browser.isThunderbirdMail()) {
       $('#container-gmail-banner').hide();
-      if (this.useFullScreenSecureCompose) {
+      if (this.pageUrlParams.useFullScreenSecureCompose) {
         this.injector.openComposeWin(undefined, true);
       }
     }

From 41dea50249ed035f7154fd8d7e69a8d3d1099eb8 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 11 Jun 2024 20:01:43 +0800
Subject: [PATCH 10/78] wip: Fix failing test

---
 extension/chrome/settings/inbox/inbox.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index c792151dca7..d1b828cafcb 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -36,9 +36,11 @@ export class InboxView extends View {
   public readonly threadId: string | undefined;
   public readonly showOriginal: boolean;
   public readonly debug: boolean;
-  public pageUrlParams: {
-    useFullScreenSecureCompose: string;
-  };
+  public pageUrlParams:
+    | {
+        useFullScreenSecureCompose?: boolean;
+      }
+    | undefined;
   public readonly S: SelCache;
   public readonly gmail: Gmail;
 
@@ -58,7 +60,7 @@ export class InboxView extends View {
     this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId');
     this.showOriginal = uncheckedUrlParams.showOriginal === true;
     this.debug = uncheckedUrlParams.debug === true;
-    this.pageUrlParams = JSON.parse(Assert.urlParamRequire.string(uncheckedUrlParams, 'pageUrlParams'));
+    this.pageUrlParams = typeof uncheckedUrlParams.pageUrlParams === 'string' ? (JSON.parse(uncheckedUrlParams.pageUrlParams) as UrlParams) : undefined;
     this.S = Ui.buildJquerySels({ threads: '.threads', thread: '.thread', body: 'body' });
     this.gmail = new Gmail(this.acctEmail);
     this.inboxMenuModule = new InboxMenuModule(this);
@@ -78,7 +80,7 @@ export class InboxView extends View {
     this.inboxNotificationModule.render();
     if (Browser.isThunderbirdMail()) {
       $('#container-gmail-banner').hide();
-      if (this.pageUrlParams.useFullScreenSecureCompose) {
+      if (this.pageUrlParams && this.pageUrlParams.useFullScreenSecureCompose) {
         this.injector.openComposeWin(undefined, true);
       }
     }

From 60bc5cd95e02148d142e22b4a4a120dc7b556396 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 12 Jun 2024 12:54:26 +0800
Subject: [PATCH 11/78] wip: Handles thunderbird popup from the background
 script

---
 extension/chrome/popups/default.ts         |  3 ---
 extension/js/common/browser/browser-msg.ts | 25 +++++++++++++++++++++-
 extension/js/service_worker/background.ts  |  3 +++
 tooling/build-types-and-manifests.ts       | 11 ++--------
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/extension/chrome/popups/default.ts b/extension/chrome/popups/default.ts
index 89c868c2f25..11114122a61 100644
--- a/extension/chrome/popups/default.ts
+++ b/extension/chrome/popups/default.ts
@@ -58,9 +58,6 @@ View.run(
     };
 
     private renderChooseEmailOrSettingsPopup = (activeAcctEmail?: string) => {
-      if (Browser.isThunderbirdMail()) {
-        $('.action_open_encrypted_inbox').text('Secure Compose');
-      }
       $('#email_or_settings').css('display', 'block');
       $('.action_open_settings').on(
         'click',
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index cb3e2fd2540..0e0676cbc95 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -8,7 +8,7 @@
 import { AuthRes } from '../api/authentication/google/google-oauth.js';
 import { AjaxErr } from '../api/shared/api-error.js';
 import { Buf } from '../core/buf.js';
-import { Dict, Str, UrlParams } from '../core/common.js';
+import { Dict, Str, Url, UrlParams } from '../core/common.js';
 import { NotificationGroupType } from '../notifications.js';
 import { Catch } from '../platform/catch.js';
 import { PassphraseDialogType } from '../xss-safe-factory.js';
@@ -18,6 +18,8 @@ import { RenderMessage } from '../render-message.js';
 import { SymEncryptedMessage, SymmetricMessageEncryption } from '../symmetric-message-encryption.js';
 import { Ajax as ApiAjax, ResFmt } from '../api/shared/api.js';
 import { Ui } from './ui.js';
+import { GlobalStore } from '../platform/store/global-store.js';
+import { BgUtils } from '../../service_worker/bgutils.js';
 
 export type GoogleAuthWindowResult$result = 'Success' | 'Denied' | 'Error' | 'Closed';
 export type ScreenDimensions = { width: number; height: number; availLeft: number; availTop: number };
@@ -377,6 +379,27 @@ export class BrowserMsg {
     });
   }
 
+  public static thunderbirdComposeButtonHandler() {
+    browser.composeAction.onClicked.addListener(async tab => {
+      const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
+      if (accountEmails) {
+        const accounts = JSON.parse(accountEmails);
+        if (accounts.length > 1) {
+          await browser.composeAction.setPopup({ popup: '/chrome/popups/default.htm' });
+          await browser.composeAction.openPopup();
+        } else {
+          // todo: use browser.compose.getComposeDetails to retrieve email recipients and pass it to the secure compose
+          await BgUtils.openExtensionTab(
+            Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify({ useFullScreenSecureCompose: true }) })
+          );
+        }
+      } else {
+        await BgUtils.openExtensionTab(Url.create('/chrome/settings/initial.htm', {}));
+      }
+      await browser.tabs.remove(Number(tab.id));
+    });
+  }
+
   public static alarmListen() {
     const alarmListener = (alarm: { name: string }) => {
       const alarmName = alarm.name;
diff --git a/extension/js/service_worker/background.ts b/extension/js/service_worker/background.ts
index 131528b7017..60ce6d495b3 100644
--- a/extension/js/service_worker/background.ts
+++ b/extension/js/service_worker/background.ts
@@ -67,4 +67,7 @@ console.info('background.js service worker starting');
   BrowserMsg.alarmListen();
   await BgHandlers.updateUninstallUrl({});
   injectFcIntoWebmail();
+
+  // Thunderbird event handlers
+  BrowserMsg.thunderbirdComposeButtonHandler();
 })().catch(Catch.reportErr);
diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts
index 43f36ea1299..af3fbabe3e6 100644
--- a/tooling/build-types-and-manifests.ts
+++ b/tooling/build-types-and-manifests.ts
@@ -55,18 +55,11 @@ addManifest(
     manifest.browser_specific_settings.strict_min_version = '102.0';
     manifest.browser_action.default_title = 'FlowCrypt';
     manifest.name = 'FlowCrypt Encryption for Thunderbird';
-    manifest.description = 'Secure end-to-end encryption with FlowCrypt'; // needs to updated later
+    manifest.description = 'Simple end-to-end encryption to secure email and attachments on Thunderbird';
+    manifest.permissions = [...manifest.permissions, 'compose'];
     manifest.compose_action = {
       default_title: 'FlowCrypt', // eslint-disable-line @typescript-eslint/naming-convention
       default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention
-      // default_popup will be updated later
-      default_popup: '/chrome/popups/default.htm', // eslint-disable-line @typescript-eslint/naming-convention
-    };
-    manifest.message_display_action = {
-      default_title: 'FlowCrypt', // eslint-disable-line @typescript-eslint/naming-convention
-      default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention
-      // default_popup will be updated later
-      default_popup: '/chrome/popups/default.htm', // eslint-disable-line @typescript-eslint/naming-convention
     };
   },
   'firefox-consumer'

From 15769064a384f244240aa77b001fb7ad415caef2 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 12 Jun 2024 18:21:05 +0800
Subject: [PATCH 12/78] wip: transfer recipient details for email reply

---
 extension/chrome/settings/inbox/inbox.ts   | 19 +++++++++++++---
 extension/js/common/browser/browser-msg.ts | 19 +++++++++++++---
 extension/js/common/inject.ts              | 26 ++++++++++++++++++----
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index d1b828cafcb..f97f9c82464 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -39,6 +39,14 @@ export class InboxView extends View {
   public pageUrlParams:
     | {
         useFullScreenSecureCompose?: boolean;
+        composeMsgDetails?: {
+          subject?: string;
+          recipients?: {
+            to?: string[];
+            cc?: string[];
+            bcc?: string[];
+          };
+        };
       }
     | undefined;
   public readonly S: SelCache;
@@ -78,11 +86,9 @@ export class InboxView extends View {
     ({ email_provider: emailProvider, picture: this.picture } = await AcctStore.get(this.acctEmail, ['email_provider', 'picture']));
     this.messageRenderer = await MessageRenderer.newInstance(this.acctEmail, this.gmail, this.relayManager, this.factory, this.debug);
     this.inboxNotificationModule.render();
+    this.preRenderSecureComposeInFullScreen();
     if (Browser.isThunderbirdMail()) {
       $('#container-gmail-banner').hide();
-      if (this.pageUrlParams && this.pageUrlParams.useFullScreenSecureCompose) {
-        this.injector.openComposeWin(undefined, true);
-      }
     }
     try {
       await Settings.populateAccountsMenu('inbox.htm');
@@ -144,6 +150,13 @@ export class InboxView extends View {
     Xss.sanitizeRender('h1', `${title}`);
   };
 
+  private preRenderSecureComposeInFullScreen = () => {
+    if (this.pageUrlParams?.useFullScreenSecureCompose) {
+      const composeMsgDetails = this.pageUrlParams.composeMsgDetails || {};
+      this.injector.openComposeWin(undefined, true, composeMsgDetails);
+    }
+  };
+
   private addBrowserMsgListeners = () => {
     BrowserMsg.addListener('add_end_session_btn', () => this.injector.insertEndSessionBtn(this.acctEmail));
     BrowserMsg.addListener('set_active_window', async ({ frameId }: Bm.ComposeWindow) => {
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 0e0676cbc95..b6c5d53a71c 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -381,6 +381,7 @@ export class BrowserMsg {
 
   public static thunderbirdComposeButtonHandler() {
     browser.composeAction.onClicked.addListener(async tab => {
+      const tabId = Number(tab.id);
       const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
       if (accountEmails) {
         const accounts = JSON.parse(accountEmails);
@@ -388,15 +389,27 @@ export class BrowserMsg {
           await browser.composeAction.setPopup({ popup: '/chrome/popups/default.htm' });
           await browser.composeAction.openPopup();
         } else {
-          // todo: use browser.compose.getComposeDetails to retrieve email recipients and pass it to the secure compose
+          // todo: pass quoted email when replying using secure compose
+          const composeDetails = await browser.compose.getComposeDetails(tabId);
+          const inboxPageParams = {
+            useFullScreenSecureCompose: true,
+            composeMsgDetails: {
+              subject: composeDetails.subject,
+              recipients: {
+                to: composeDetails.to,
+                cc: composeDetails.cc,
+                bcc: composeDetails.bcc,
+              },
+            },
+          };
           await BgUtils.openExtensionTab(
-            Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify({ useFullScreenSecureCompose: true }) })
+            Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify(inboxPageParams) })
           );
         }
       } else {
         await BgUtils.openExtensionTab(Url.create('/chrome/settings/initial.htm', {}));
       }
-      await browser.tabs.remove(Number(tab.id));
+      await browser.tabs.remove(tabId);
     });
   }
 
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index c8435e99cfd..b4a88dc6a55 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -62,7 +62,11 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (draftId?: string, fullscreen = false): boolean => {
+  public openComposeWin = (
+    draftId?: string,
+    fullscreen = false,
+    composeMsgDetails?: { subject?: string; recipients?: { to?: string[]; cc?: string[]; bcc?: string[] } } | undefined
+  ): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
       const composeWin = $(this.factory.embeddedCompose(draftId));
@@ -72,9 +76,23 @@ export class Injector {
         const composeFrameId = this.S.cached('secure_compose_window').attr('data-frame-id') || '';
         $(`#${composeFrameId}`).on('load', () => {
           const composeIframe = document.getElementById(composeFrameId) as HTMLIFrameElement;
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          const composeIframeDoc = composeIframe!.contentWindow!.document;
-          $(composeIframeDoc.body).addClass('full_window');
+          const composeIframeDoc = composeIframe?.contentDocument;
+          if (composeIframeDoc) {
+            $(composeIframeDoc.body).addClass('full_window');
+            if (composeMsgDetails?.recipients) {
+              const { to = [], cc = [], bcc = [] } = composeMsgDetails.recipients;
+              if (to.length || cc.length || bcc.length) {
+                const body = $(composeIframeDoc.body);
+                body.find('#input_addresses_container').removeClass('invisible');
+                body.find('#recipients_placeholder').hide();
+                body.find('#input_to').val(to.join(','));
+                body.find('#input-container-cc input').val(cc.join(','));
+                body.find('#input-container-bcc input').val(bcc.join(','));
+                body.find('#input_subject').val(composeMsgDetails.subject || '');
+                // todo - find a way to execute parseRenderRecipients here
+              }
+            }
+          }
         });
         this.S.cached('secure_compose_window').addClass('active full_window');
       }

From 1413e14abf44b632407c3106d0a15bbb9f7a07ae Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 12 Jun 2024 19:27:06 +0800
Subject: [PATCH 13/78] wip: Add a way to parse rendered recipients

---
 .../compose-modules/compose-recipients-module.ts       |  5 +++++
 extension/chrome/elements/compose.ts                   | 10 ++++++++++
 extension/js/common/inject.ts                          |  1 -
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose-modules/compose-recipients-module.ts b/extension/chrome/elements/compose-modules/compose-recipients-module.ts
index d98846f2450..a237966b895 100644
--- a/extension/chrome/elements/compose-modules/compose-recipients-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-recipients-module.ts
@@ -144,10 +144,15 @@ export class ComposeRecipientsModule extends ViewModule<ComposeView> {
   public validateEmails = (uncheckedEmails: string[]): { valid: EmailParts[]; invalid: string[] } => {
     const valid: EmailParts[] = [];
     const invalid: string[] = [];
+    const uniqueEmails = new Set<string>();
     for (const email of uncheckedEmails) {
+      if (uniqueEmails.has(email)) {
+        continue;
+      }
       const parsed = Str.parseEmail(email);
       if (parsed.email) {
         valid.push({ email: parsed.email, name: parsed.name });
+        uniqueEmails.add(email);
       } else {
         invalid.push(email);
       }
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index e34353bb22c..079127726d6 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -192,6 +192,7 @@ export class ComposeView extends View {
     this.myPubkeyModule = new ComposeMyPubkeyModule(this);
     this.storageModule = new ComposeStorageModule(this);
     await this.acctServer.initialize();
+    await this.preParseEmailRecipientsIfNeeded();
     if (!this.isReplyBox) {
       await Assert.abortAndRenderErrOnUnprotectedKey(this.acctEmail);
     }
@@ -260,6 +261,15 @@ export class ComposeView extends View {
   };
 
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
+
+  private preParseEmailRecipientsIfNeeded = async () => {
+    const preParsedRecipient = ['#input-container-to', '#input-container-cc', '#input-container-bcc'];
+    for (const inputContainer of preParsedRecipient) {
+      if (String($(inputContainer).find('input').val()).trim().length > 0) {
+        await this.recipientsModule.parseRenderRecipients($(inputContainer).find('input'));
+      }
+    }
+  };
 }
 
 View.run(ComposeView);
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index b4a88dc6a55..12d73e633cf 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -89,7 +89,6 @@ export class Injector {
                 body.find('#input-container-cc input').val(cc.join(','));
                 body.find('#input-container-bcc input').val(bcc.join(','));
                 body.find('#input_subject').val(composeMsgDetails.subject || '');
-                // todo - find a way to execute parseRenderRecipients here
               }
             }
           }

From b2865432b769418c70f7c86c3cf12a6641bcf9d0 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 13 Jun 2024 14:39:49 +0800
Subject: [PATCH 14/78] wip: Properly handled closing of Thunderbird compose
 window

---
 extension/chrome/popups/default.ts         | 18 ++++++++++++++++--
 extension/chrome/popups/select_account.ts  | 10 ++++++++--
 extension/js/common/browser/browser-msg.ts |  4 ++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/extension/chrome/popups/default.ts b/extension/chrome/popups/default.ts
index 11114122a61..272d5aee309 100644
--- a/extension/chrome/popups/default.ts
+++ b/extension/chrome/popups/default.ts
@@ -9,15 +9,29 @@ import { Time } from '../../js/common/browser/time.js';
 import { View } from '../../js/common/view.js';
 import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { GlobalStore } from '../../js/common/platform/store/global-store.js';
+import { Url } from '../../js/common/core/common.js';
+import { Assert } from '../../js/common/assert.js';
 
 View.run(
   class DefaultPopupView extends View {
+    private readonly tabId?: number;
+
     public constructor() {
       super();
+      const uncheckedUrlParams = Url.parse(['tabId']);
+      this.tabId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'tabId'));
     }
 
     public render = async () => {
       const activeTab = await BrowserMsg.send.bg.await.getActiveTabInfo();
+      if (Browser.isThunderbirdMail()) {
+        const windowInfo = await browser.windows.getCurrent();
+        if (windowInfo.type === 'messageCompose') {
+          $('.action_open_settings').hide();
+          $('.action_open_encrypted_inbox').parent().css('margin-right', '0');
+          $('.action_open_encrypted_inbox').text('Secure Compose');
+        }
+      }
       if (activeTab?.acctEmail) {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         const { setup_done } = await AcctStore.get(activeTab.acctEmail, ['setup_done']);
@@ -65,7 +79,7 @@ View.run(
           if (activeAcctEmail) {
             await this.redirectToInitSetup(activeAcctEmail);
           } else {
-            window.location.href = 'select_account.htm?action=settings';
+            window.location.href = Url.create('select_account.htm', { action: 'settings' });
           }
         })
       );
@@ -77,7 +91,7 @@ View.run(
             await Time.sleep(100);
             window.close();
           } else {
-            window.location.href = 'select_account.htm?action=inbox';
+            window.location.href = Url.create('select_account.htm', { action: 'inbox', tabId: this.tabId });
           }
         })
       );
diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index 7ab763e963c..56ca10d7baf 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -15,11 +15,13 @@ import { GlobalStore } from '../../js/common/platform/store/global-store.js';
 View.run(
   class SelectAcctPopupView extends View {
     private readonly action: 'inbox' | 'settings';
+    private readonly tabId: number;
 
     public constructor() {
       super();
-      const uncheckedUrlParams = Url.parse(['action']);
+      const uncheckedUrlParams = Url.parse(['action', 'tabId']);
       this.action = Assert.urlParamRequire.oneof(uncheckedUrlParams, 'action', ['inbox', 'settings']);
+      this.tabId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'tabId'));
     }
 
     public render = async () => {
@@ -63,7 +65,11 @@ View.run(
         await Browser.openSettingsPage('index.htm', $(clickedElement).attr('email'));
       }
       await Time.sleep(100);
-      window.close();
+      if (this.tabId) {
+        await browser.tabs.remove(this.tabId);
+      } else {
+        window.close();
+      }
     };
 
     private actionRedirectToAddAcctPageHandler = async () => {
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index b6c5d53a71c..b7abbaf523d 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -386,7 +386,7 @@ export class BrowserMsg {
       if (accountEmails) {
         const accounts = JSON.parse(accountEmails);
         if (accounts.length > 1) {
-          await browser.composeAction.setPopup({ popup: '/chrome/popups/default.htm' });
+          await browser.composeAction.setPopup({ popup: Url.create('/chrome/popups/default.htm', { tabId }) });
           await browser.composeAction.openPopup();
         } else {
           // todo: pass quoted email when replying using secure compose
@@ -405,11 +405,11 @@ export class BrowserMsg {
           await BgUtils.openExtensionTab(
             Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify(inboxPageParams) })
           );
+          await browser.tabs.remove(tabId);
         }
       } else {
         await BgUtils.openExtensionTab(Url.create('/chrome/settings/initial.htm', {}));
       }
-      await browser.tabs.remove(tabId);
     });
   }
 

From 0d8349f8e44ecd30ed268f233e77cc2e6fc98467 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Mon, 17 Jun 2024 16:37:01 +0800
Subject: [PATCH 15/78] PR review: cleanup

---
 extension/chrome/popups/default.ts        |  2 +-
 extension/chrome/popups/select_account.ts |  2 +-
 extension/chrome/settings/inbox/inbox.ts  |  2 +-
 extension/js/common/browser/browser.ts    | 19 ++++---------------
 extension/js/common/platform/catch.ts     |  4 ++++
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/extension/chrome/popups/default.ts b/extension/chrome/popups/default.ts
index 272d5aee309..66480791779 100644
--- a/extension/chrome/popups/default.ts
+++ b/extension/chrome/popups/default.ts
@@ -24,7 +24,7 @@ View.run(
 
     public render = async () => {
       const activeTab = await BrowserMsg.send.bg.await.getActiveTabInfo();
-      if (Browser.isThunderbirdMail()) {
+      if (Catch.isThunderbirdMail()) {
         const windowInfo = await browser.windows.getCurrent();
         if (windowInfo.type === 'messageCompose') {
           $('.action_open_settings').hide();
diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index 56ca10d7baf..a452155b6a9 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -58,7 +58,7 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
-      const useFullScreenSecureCompose = Browser.isThunderbirdMail();
+      const useFullScreenSecureCompose = Catch.isThunderbirdMail();
       if (this.action === 'inbox') {
         await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, { useFullScreenSecureCompose });
       } else {
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index f97f9c82464..f95f01af87c 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -87,7 +87,7 @@ export class InboxView extends View {
     this.messageRenderer = await MessageRenderer.newInstance(this.acctEmail, this.gmail, this.relayManager, this.factory, this.debug);
     this.inboxNotificationModule.render();
     this.preRenderSecureComposeInFullScreen();
-    if (Browser.isThunderbirdMail()) {
+    if (Catch.isThunderbirdMail()) {
       $('#container-gmail-banner').hide();
     }
     try {
diff --git a/extension/js/common/browser/browser.ts b/extension/js/common/browser/browser.ts
index 4e969972c54..1606a3944d9 100644
--- a/extension/js/common/browser/browser.ts
+++ b/extension/js/common/browser/browser.ts
@@ -16,10 +16,6 @@ export class Browser {
     return URL.createObjectURL(new Blob([content], { type: 'application/octet-stream' }));
   };
 
-  public static isThunderbirdMail = () => {
-    return Catch.browser().name === 'thunderbird';
-  };
-
   public static saveToDownloads = (attachment: Attachment) => {
     const blob = new Blob([attachment.getData()], { type: attachment.type });
     const a = window.document.createElement('a');
@@ -57,28 +53,21 @@ export class Browser {
     return array;
   };
 
-  public static openSettingsPage = async (
-    path = 'index.htm',
-    acctEmail?: string,
-    page = '',
-    rawPageUrlParams?: Dict<UrlParam>,
-    addNewAcct = false,
-    currentPageParams?: Dict<UrlParam>
-  ) => {
+  public static openSettingsPage = async (path = 'index.htm', acctEmail?: string, page = '', rawPageUrlParams?: Dict<UrlParam>, addNewAcct = false) => {
     const basePath = chrome.runtime.getURL(`chrome/settings/${path}`);
     const pageUrlParams = rawPageUrlParams ? JSON.stringify(rawPageUrlParams) : undefined;
     if (acctEmail || path === 'fatal.htm') {
-      await Browser.openExtensionTab(Url.create(basePath, { acctEmail, page, pageUrlParams, ...currentPageParams }));
+      await Browser.openExtensionTab(Url.create(basePath, { acctEmail, page, pageUrlParams }));
     } else if (addNewAcct) {
       await Browser.openExtensionTab(Url.create(basePath, { addNewAcct }));
     } else {
       const acctEmails = await GlobalStore.acctEmailsGet();
-      await Browser.openExtensionTab(Url.create(basePath, { acctEmail: acctEmails[0], page, pageUrlParams, ...currentPageParams }));
+      await Browser.openExtensionTab(Url.create(basePath, { acctEmail: acctEmails[0], page, pageUrlParams }));
     }
   };
 
   public static openExtensionTab = async (url: string) => {
-    if (Browser.isThunderbirdMail()) {
+    if (Catch.isThunderbirdMail()) {
       await BgUtils.openExtensionTab(url);
     } else {
       const tab = window.open(url, 'flowcrypt');
diff --git a/extension/js/common/platform/catch.ts b/extension/js/common/platform/catch.ts
index 6df745b6cb9..91ebc723187 100644
--- a/extension/js/common/platform/catch.ts
+++ b/extension/js/common/platform/catch.ts
@@ -174,6 +174,10 @@ export class Catch {
     return Catch.browser().name === 'firefox';
   }
 
+  public static isThunderbirdMail = () => {
+    return Catch.browser().name === 'thunderbird';
+  };
+
   public static environment(url = location.href): string {
     const browserName = Catch.browser().name;
     const origin = new URL(location.href).origin;

From a63e79ccd7c386acaf313b80dfd3a8383033efd8 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Mon, 17 Jun 2024 18:41:26 +0800
Subject: [PATCH 16/78] Pr review: Add "secure compose" on messageDisplay

---
 extension/chrome/settings/inbox/inbox.ts   |  7 ++--
 extension/js/common/browser/browser-msg.ts | 38 +++++++++++++++-------
 extension/js/common/inject.ts              | 24 +++++++-------
 extension/js/service_worker/background.ts  |  2 +-
 tooling/build-types-and-manifests.ts       |  8 +++--
 5 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index f95f01af87c..52f91a4b59b 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -39,8 +39,8 @@ export class InboxView extends View {
   public pageUrlParams:
     | {
         useFullScreenSecureCompose?: boolean;
-        composeMsgDetails?: {
-          subject?: string;
+        messageDetails?: {
+          subject: string;
           recipients?: {
             to?: string[];
             cc?: string[];
@@ -152,8 +152,7 @@ export class InboxView extends View {
 
   private preRenderSecureComposeInFullScreen = () => {
     if (this.pageUrlParams?.useFullScreenSecureCompose) {
-      const composeMsgDetails = this.pageUrlParams.composeMsgDetails || {};
-      this.injector.openComposeWin(undefined, true, composeMsgDetails);
+      this.injector.openComposeWin(undefined, true, this.pageUrlParams.messageDetails);
     }
   };
 
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index b7abbaf523d..668a113e03a 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -379,26 +379,36 @@ export class BrowserMsg {
     });
   }
 
-  public static thunderbirdComposeButtonHandler() {
-    browser.composeAction.onClicked.addListener(async tab => {
-      const tabId = Number(tab.id);
+  public static thunderbirdSecureComposeHandler() {
+    type MessageDetails = {
+      subject: string;
+      to?: string;
+      cc?: string[];
+      bcc?: string[];
+      bccList?: string[];
+      ccList?: string[];
+    };
+
+    const handleClickEvent = async (tabId: number, action = 'compose' || 'message_display') => {
       const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
+      const actionType = action === 'compose' ? browser.composeAction : browser.messageDisplayAction;
+      const browserApiMethod = action === 'compose' ? browser.compose.getComposeDetails : browser.messageDisplay.getDisplayedMessage;
       if (accountEmails) {
         const accounts = JSON.parse(accountEmails);
         if (accounts.length > 1) {
-          await browser.composeAction.setPopup({ popup: Url.create('/chrome/popups/default.htm', { tabId }) });
-          await browser.composeAction.openPopup();
+          await actionType.setPopup({ popup: Url.create('/chrome/popups/default.htm', { tabId }) });
+          await actionType.openPopup();
         } else {
           // todo: pass quoted email when replying using secure compose
-          const composeDetails = await browser.compose.getComposeDetails(tabId);
+          const messageDetails = (await browserApiMethod(tabId)) as MessageDetails;
           const inboxPageParams = {
             useFullScreenSecureCompose: true,
-            composeMsgDetails: {
-              subject: composeDetails.subject,
+            messageDetails: {
+              subject: messageDetails.subject,
               recipients: {
-                to: composeDetails.to,
-                cc: composeDetails.cc,
-                bcc: composeDetails.bcc,
+                to: messageDetails?.to || '',
+                cc: messageDetails?.cc || messageDetails.ccList,
+                bcc: messageDetails?.bcc || messageDetails.bccList,
               },
             },
           };
@@ -410,6 +420,12 @@ export class BrowserMsg {
       } else {
         await BgUtils.openExtensionTab(Url.create('/chrome/settings/initial.htm', {}));
       }
+    };
+    browser.composeAction.onClicked.addListener(async tab => {
+      await handleClickEvent(Number(tab.id), 'compose');
+    });
+    browser.messageDisplayAction.onClicked.addListener(async tab => {
+      await handleClickEvent(Number(tab.id), 'message_display');
     });
   }
 
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index 12d73e633cf..c363053050c 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -65,7 +65,7 @@ export class Injector {
   public openComposeWin = (
     draftId?: string,
     fullscreen = false,
-    composeMsgDetails?: { subject?: string; recipients?: { to?: string[]; cc?: string[]; bcc?: string[] } } | undefined
+    messageDetails?: { subject: string; recipients?: { to?: string[]; cc?: string[]; bcc?: string[] } } | undefined
   ): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
@@ -79,16 +79,18 @@ export class Injector {
           const composeIframeDoc = composeIframe?.contentDocument;
           if (composeIframeDoc) {
             $(composeIframeDoc.body).addClass('full_window');
-            if (composeMsgDetails?.recipients) {
-              const { to = [], cc = [], bcc = [] } = composeMsgDetails.recipients;
-              if (to.length || cc.length || bcc.length) {
-                const body = $(composeIframeDoc.body);
-                body.find('#input_addresses_container').removeClass('invisible');
-                body.find('#recipients_placeholder').hide();
-                body.find('#input_to').val(to.join(','));
-                body.find('#input-container-cc input').val(cc.join(','));
-                body.find('#input-container-bcc input').val(bcc.join(','));
-                body.find('#input_subject').val(composeMsgDetails.subject || '');
+            const body = $(composeIframeDoc.body);
+            if (messageDetails) {
+              body.find('#input_subject').val(messageDetails.subject);
+              if (messageDetails.recipients) {
+                const { to = [], cc = [], bcc = [] } = messageDetails.recipients;
+                if (to.length || cc.length || bcc.length) {
+                  body.find('#input_addresses_container').removeClass('invisible');
+                  body.find('#recipients_placeholder').hide();
+                  body.find('#input_to').val(to.join(','));
+                  body.find('#input-container-cc input').val(cc.join(','));
+                  body.find('#input-container-bcc input').val(bcc.join(','));
+                }
               }
             }
           }
diff --git a/extension/js/service_worker/background.ts b/extension/js/service_worker/background.ts
index 60ce6d495b3..fadcc742744 100644
--- a/extension/js/service_worker/background.ts
+++ b/extension/js/service_worker/background.ts
@@ -69,5 +69,5 @@ console.info('background.js service worker starting');
   injectFcIntoWebmail();
 
   // Thunderbird event handlers
-  BrowserMsg.thunderbirdComposeButtonHandler();
+  BrowserMsg.thunderbirdSecureComposeHandler();
 })().catch(Catch.reportErr);
diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts
index af3fbabe3e6..77e786611d2 100644
--- a/tooling/build-types-and-manifests.ts
+++ b/tooling/build-types-and-manifests.ts
@@ -56,9 +56,13 @@ addManifest(
     manifest.browser_action.default_title = 'FlowCrypt';
     manifest.name = 'FlowCrypt Encryption for Thunderbird';
     manifest.description = 'Simple end-to-end encryption to secure email and attachments on Thunderbird';
-    manifest.permissions = [...manifest.permissions, 'compose'];
+    manifest.permissions = [...manifest.permissions, 'compose', 'messagesRead'];
     manifest.compose_action = {
-      default_title: 'FlowCrypt', // eslint-disable-line @typescript-eslint/naming-convention
+      default_title: 'Secure Compose', // eslint-disable-line @typescript-eslint/naming-convention
+      default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention
+    };
+    manifest.message_display_action = {
+      default_title: 'Secure Compose', // eslint-disable-line @typescript-eslint/naming-convention
       default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention
     };
   },

From 7db7a30fb026312f7cba00b21960c88c132ae595 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 19 Jun 2024 12:36:43 +0800
Subject: [PATCH 17/78] Pr review: Define type for the Thunderbird message
 details

---
 .../elements/compose-modules/compose-types.ts  |  7 +++++++
 extension/chrome/settings/inbox/inbox.ts       | 10 ++--------
 extension/js/common/browser/browser-msg.ts     | 18 ++++++------------
 extension/js/common/inject.ts                  | 11 ++++-------
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-types.ts b/extension/chrome/elements/compose-modules/compose-types.ts
index f1b299968d7..303e5a8a6d8 100644
--- a/extension/chrome/elements/compose-modules/compose-types.ts
+++ b/extension/chrome/elements/compose-modules/compose-types.ts
@@ -45,6 +45,13 @@ export type MessageToReplyOrForwardHeaders = {
   cc?: string[];
 };
 
+export interface ThunderbirdMessageDetails {
+  subject: string;
+  to?: string[];
+  cc?: string[];
+  bcc?: string[];
+}
+
 export type MessageToReplyOrForward = {
   headers: MessageToReplyOrForwardHeaders;
   isOnlySigned?: boolean;
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 52f91a4b59b..faa24772ef6 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -24,6 +24,7 @@ import { XssSafeFactory } from '../../../js/common/xss-safe-factory.js';
 import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
 import { RelayManager } from '../../../js/common/relay-manager.js';
 import { MessageRenderer } from '../../../js/common/message-renderer.js';
+import { ThunderbirdMessageDetails } from '../../elements/compose-modules/compose-types.js';
 
 export class InboxView extends View {
   public readonly inboxMenuModule: InboxMenuModule;
@@ -39,14 +40,7 @@ export class InboxView extends View {
   public pageUrlParams:
     | {
         useFullScreenSecureCompose?: boolean;
-        messageDetails?: {
-          subject: string;
-          recipients?: {
-            to?: string[];
-            cc?: string[];
-            bcc?: string[];
-          };
-        };
+        messageDetails?: ThunderbirdMessageDetails;
       }
     | undefined;
   public readonly S: SelCache;
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 668a113e03a..73c9a6623fb 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -20,6 +20,7 @@ import { Ajax as ApiAjax, ResFmt } from '../api/shared/api.js';
 import { Ui } from './ui.js';
 import { GlobalStore } from '../platform/store/global-store.js';
 import { BgUtils } from '../../service_worker/bgutils.js';
+import { ThunderbirdMessageDetails } from '../../../chrome/elements/compose-modules/compose-types.js';
 
 export type GoogleAuthWindowResult$result = 'Success' | 'Denied' | 'Error' | 'Closed';
 export type ScreenDimensions = { width: number; height: number; availLeft: number; availTop: number };
@@ -380,15 +381,10 @@ export class BrowserMsg {
   }
 
   public static thunderbirdSecureComposeHandler() {
-    type MessageDetails = {
-      subject: string;
-      to?: string;
-      cc?: string[];
-      bcc?: string[];
+    interface MessageDetails extends ThunderbirdMessageDetails {
       bccList?: string[];
       ccList?: string[];
-    };
-
+    }
     const handleClickEvent = async (tabId: number, action = 'compose' || 'message_display') => {
       const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
       const actionType = action === 'compose' ? browser.composeAction : browser.messageDisplayAction;
@@ -405,11 +401,9 @@ export class BrowserMsg {
             useFullScreenSecureCompose: true,
             messageDetails: {
               subject: messageDetails.subject,
-              recipients: {
-                to: messageDetails?.to || '',
-                cc: messageDetails?.cc || messageDetails.ccList,
-                bcc: messageDetails?.bcc || messageDetails.bccList,
-              },
+              to: messageDetails?.to || '',
+              cc: messageDetails?.cc || messageDetails?.ccList,
+              bcc: messageDetails?.bcc || messageDetails?.bccList,
             },
           };
           await BgUtils.openExtensionTab(
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index c363053050c..acae4a7b8e0 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -11,6 +11,7 @@ import { Dict } from './core/common.js';
 import { Env, WebMailName, WebMailVersion } from './browser/env.js';
 import { KeyStore } from './platform/store/key-store.js';
 import { PassphraseStore } from './platform/store/passphrase-store.js';
+import { ThunderbirdMessageDetails } from '../../chrome/elements/compose-modules/compose-types.js';
 
 type Host = {
   gmail: string;
@@ -62,11 +63,7 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (
-    draftId?: string,
-    fullscreen = false,
-    messageDetails?: { subject: string; recipients?: { to?: string[]; cc?: string[]; bcc?: string[] } } | undefined
-  ): boolean => {
+  public openComposeWin = (draftId?: string, fullscreen = false, messageDetails?: ThunderbirdMessageDetails | undefined): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
       const composeWin = $(this.factory.embeddedCompose(draftId));
@@ -82,8 +79,8 @@ export class Injector {
             const body = $(composeIframeDoc.body);
             if (messageDetails) {
               body.find('#input_subject').val(messageDetails.subject);
-              if (messageDetails.recipients) {
-                const { to = [], cc = [], bcc = [] } = messageDetails.recipients;
+              if (messageDetails) {
+                const { to = [], cc = [], bcc = [] } = messageDetails;
                 if (to.length || cc.length || bcc.length) {
                   body.find('#input_addresses_container').removeClass('invisible');
                   body.find('#recipients_placeholder').hide();

From 0ce90c2e556c061cf796f254685ecbd615d6819a Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 19 Jun 2024 14:08:14 +0800
Subject: [PATCH 18/78] Fix: email duplicates and unexpected creation of drafts
 upon recipient details prefill

---
 .../elements/compose-modules/compose-draft-module.ts   | 10 +++++-----
 .../compose-modules/compose-recipients-module.ts       |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts
index f360fefb5d7..914c08c27b8 100644
--- a/extension/chrome/elements/compose-modules/compose-draft-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts
@@ -38,11 +38,6 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
 
   public constructor(composer: ComposeView) {
     super(composer);
-    // Only start draft timer when draft id is not set.
-    // When draft id is set, draft timer will start only when draft is decrypted successfully
-    if (!this.view.disableDraftSaving && !this.view.draftId) {
-      this.startDraftTimer();
-    }
   }
 
   public setHandlers = () => {
@@ -126,6 +121,11 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
     if (this.disableSendingDrafts) {
       return;
     }
+    // Only start draft timer when draft id is not set.
+    // When draft id is set, draft timer will start only when draft is decrypted successfully
+    if (!this.view.disableDraftSaving && !this.view.draftId) {
+      this.startDraftTimer();
+    }
     if (this.hasBodyChanged(this.view.inputModule.squire.getHTML()) || this.hasSubjectChanged(String(this.view.S.cached('input_subject').val())) || forceSave) {
       this.currentlySavingDraft = true;
       try {
diff --git a/extension/chrome/elements/compose-modules/compose-recipients-module.ts b/extension/chrome/elements/compose-modules/compose-recipients-module.ts
index a237966b895..d98846f2450 100644
--- a/extension/chrome/elements/compose-modules/compose-recipients-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-recipients-module.ts
@@ -144,15 +144,10 @@ export class ComposeRecipientsModule extends ViewModule<ComposeView> {
   public validateEmails = (uncheckedEmails: string[]): { valid: EmailParts[]; invalid: string[] } => {
     const valid: EmailParts[] = [];
     const invalid: string[] = [];
-    const uniqueEmails = new Set<string>();
     for (const email of uncheckedEmails) {
-      if (uniqueEmails.has(email)) {
-        continue;
-      }
       const parsed = Str.parseEmail(email);
       if (parsed.email) {
         valid.push({ email: parsed.email, name: parsed.name });
-        uniqueEmails.add(email);
       } else {
         invalid.push(email);
       }

From a1a812c5cae97a23844dfc0f76c33f7978d601e2 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 19 Jun 2024 18:26:53 +0800
Subject: [PATCH 19/78] wip: refactor + cleanup

---
 extension/chrome/elements/compose.ts    | 24 ++++++++++++++++++++
 extension/js/common/inject.ts           | 29 ++-----------------------
 extension/js/common/xss-safe-factory.ts | 17 ++++++++++-----
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 079127726d6..584f09ad460 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -32,6 +32,7 @@ import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { AccountServer } from '../../js/common/api/account-server.js';
 import { ComposeReplyBtnPopoverModule, ReplyOption } from './compose-modules/compose-reply-btn-popover-module.js';
 import { Lang } from '../../js/common/lang.js';
+import { ThunderbirdMessageDetails } from './compose-modules/compose-types.js';
 
 export class ComposeView extends View {
   public readonly acctEmail: string;
@@ -41,9 +42,11 @@ export class ComposeView extends View {
   public readonly removeAfterClose: boolean;
   public readonly disableDraftSaving: boolean;
   public readonly debug: boolean;
+  public readonly useFullScreenSecureCompose: boolean;
   public readonly isReplyBox: boolean;
   public readonly replyMsgId: string;
   public readonly replyPubkeyMismatch: boolean;
+  public readonly externalMessageDetails: string;
   public replyOption?: ReplyOption;
   public fesUrl?: string;
   public skipClickPrompt: boolean;
@@ -119,6 +122,8 @@ export class ComposeView extends View {
     recipients: 'span.recipients',
     contacts: '#contacts',
     input_addresses_container_outer: '#input_addresses_container',
+    input_container_cc: '#input-container-cc input',
+    input_container_bcc: '#input-container-bcc input',
     recipient_left_label: '.recipient-left-label',
     input_container_from: '#input-container-from',
     input_addresses_container_inner: '#input_addresses_container > div:first',
@@ -148,6 +153,8 @@ export class ComposeView extends View {
       'removeAfterClose',
       'replyPubkeyMismatch',
       'replyOption',
+      'useFullScreenSecureCompose',
+      'externalMessageDetails',
     ]);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId');
@@ -161,6 +168,8 @@ export class ComposeView extends View {
     this.replyPubkeyMismatch = uncheckedUrlParams.replyPubkeyMismatch === true;
     this.draftId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'draftId') || '';
     this.replyMsgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'replyMsgId') || '';
+    this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
+    this.externalMessageDetails = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'externalMessageDetails') || '';
     this.isReplyBox = !!this.replyMsgId;
     this.emailProvider = new Gmail(this.acctEmail);
     this.acctServer = new AccountServer(this.acctEmail);
@@ -263,6 +272,21 @@ export class ComposeView extends View {
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
 
   private preParseEmailRecipientsIfNeeded = async () => {
+    if (this.useFullScreenSecureCompose) {
+      $('body').addClass('full_window');
+    }
+    if (this.externalMessageDetails) {
+      const messageDetails = JSON.parse(this.externalMessageDetails) as ThunderbirdMessageDetails;
+      this.S.cached('input_subject').val(messageDetails.subject);
+      const { to = [], cc = [], bcc = [] } = messageDetails;
+      if (to.length || cc.length || bcc.length) {
+        this.S.cached('input_addresses_container_outer').removeClass('invisible');
+        this.S.cached('recipients_placeholder').hide();
+        this.S.cached('input_to').val(to.join(','));
+        this.S.cached('input_container_cc').val(cc.join(','));
+        this.S.cached('input_container_bcc').val(cc.join(','));
+      }
+    }
     const preParsedRecipient = ['#input-container-to', '#input-container-cc', '#input-container-bcc'];
     for (const inputContainer of preParsedRecipient) {
       if (String($(inputContainer).find('input').val()).trim().length > 0) {
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index acae4a7b8e0..a4b382559f4 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -63,37 +63,12 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (draftId?: string, fullscreen = false, messageDetails?: ThunderbirdMessageDetails | undefined): boolean => {
+  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, messageDetails?: ThunderbirdMessageDetails | undefined): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
-      const composeWin = $(this.factory.embeddedCompose(draftId));
+      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, { ...messageDetails }));
       composeWin.attr('data-order', alreadyOpenedCount + 1);
       this.S.cached('body').append(composeWin); // xss-safe-factory
-      if (fullscreen) {
-        const composeFrameId = this.S.cached('secure_compose_window').attr('data-frame-id') || '';
-        $(`#${composeFrameId}`).on('load', () => {
-          const composeIframe = document.getElementById(composeFrameId) as HTMLIFrameElement;
-          const composeIframeDoc = composeIframe?.contentDocument;
-          if (composeIframeDoc) {
-            $(composeIframeDoc.body).addClass('full_window');
-            const body = $(composeIframeDoc.body);
-            if (messageDetails) {
-              body.find('#input_subject').val(messageDetails.subject);
-              if (messageDetails) {
-                const { to = [], cc = [], bcc = [] } = messageDetails;
-                if (to.length || cc.length || bcc.length) {
-                  body.find('#input_addresses_container').removeClass('invisible');
-                  body.find('#recipients_placeholder').hide();
-                  body.find('#input_to').val(to.join(','));
-                  body.find('#input-container-cc input').val(cc.join(','));
-                  body.find('#input-container-bcc input').val(bcc.join(','));
-                }
-              }
-            }
-          }
-        });
-        this.S.cached('secure_compose_window').addClass('active full_window');
-      }
       return true;
     } else {
       Ui.toast('Only 3 FlowCrypt windows can be opened at a time', false, 3, 'top', 'error');
diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts
index 628db138225..98ea3d55536 100644
--- a/extension/js/common/xss-safe-factory.ts
+++ b/extension/js/common/xss-safe-factory.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { Dict, Str, Url, UrlParams } from './core/common.js';
+import { Dict, Str, Url, UrlParam, UrlParams } from './core/common.js';
 import { Attachment } from './core/attachment.js';
 import { Browser } from './browser/browser.js';
 import { BrowserMsg } from './browser/browser-msg.js';
@@ -96,8 +96,13 @@ export class XssSafeFactory {
     return this.extUrl(`img/${relPath}`);
   };
 
-  public srcComposeMsg = (draftId?: string) => {
-    return this.frameSrc(this.extUrl('chrome/elements/compose.htm'), { frameId: this.newId(), draftId });
+  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, messageDetails?: Dict<UrlParam>) => {
+    return this.frameSrc(this.extUrl('chrome/elements/compose.htm'), {
+      frameId: this.newId(),
+      draftId,
+      useFullScreenSecureCompose,
+      externalMessageDetails: JSON.stringify(messageDetails),
+    });
   };
 
   public srcPassphraseDialog = (longids: string[] = [], type: PassphraseDialogType, initiatorFrameId?: string) => {
@@ -194,10 +199,10 @@ export class XssSafeFactory {
     await Ui.modal.iframe(this.srcAddPubkeyDialog(emails, 'gmail'), undefined, 'dialog-add-pubkey');
   };
 
-  public embeddedCompose = (draftId?: string) => {
-    const srcComposeMsg = this.srcComposeMsg(draftId);
+  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, messageDetails?: Dict<UrlParam>) => {
+    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, messageDetails);
     return Ui.e('div', {
-      class: 'secure_compose_window',
+      class: openInFullScreen ? 'secure_compose_window active full_window' : 'secure_compose_window',
       html: this.iframe(srcComposeMsg, [], { scrolling: 'no' }),
       'data-frame-id': String(Url.parse(['frameId'], srcComposeMsg).frameId),
       'data-test': 'container-new-message',

From e55c470a9c10255de63bca1b8e802da04f806b7b Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 19 Jun 2024 19:45:09 +0800
Subject: [PATCH 20/78] Fix: slow rendering of secure compose in full screen

---
 .../elements/compose-modules/compose-render-module.ts     | 8 ++++++--
 extension/chrome/elements/compose.ts                      | 5 +----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
index c288873ffcc..be8b53e94ea 100644
--- a/extension/chrome/elements/compose-modules/compose-render-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -27,6 +27,9 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
   private previousReplyOption: ReplyOption | undefined;
 
   public initComposeBox = async () => {
+    if (this.view.useFullScreenSecureCompose) {
+      $('body').addClass('full_window');
+    }
     if (this.view.isReplyBox) {
       this.responseMethod = 'reply';
     }
@@ -94,8 +97,9 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
       const thread = await this.view.emailProvider.threadGet(this.view.threadId, 'metadata');
       const inReplyToMessage = thread.messages?.find(message => message.id === this.view.replyMsgId);
       if (inReplyToMessage) {
-        this.view.replyParams.inReplyTo = inReplyToMessage.payload?.headers?.find(header => header.name === 'Message-Id' || header.name === 'Message-ID')
-          ?.value;
+        this.view.replyParams.inReplyTo = inReplyToMessage.payload?.headers?.find(
+          header => header.name === 'Message-Id' || header.name === 'Message-ID'
+        )?.value;
       }
       this.view.replyParams.subject = `${this.responseMethod === 'reply' ? 'Re' : 'Fwd'}: ${this.view.replyParams.subject}`;
     }
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 584f09ad460..c77142fc16f 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -201,7 +201,6 @@ export class ComposeView extends View {
     this.myPubkeyModule = new ComposeMyPubkeyModule(this);
     this.storageModule = new ComposeStorageModule(this);
     await this.acctServer.initialize();
-    await this.preParseEmailRecipientsIfNeeded();
     if (!this.isReplyBox) {
       await Assert.abortAndRenderErrOnUnprotectedKey(this.acctEmail);
     }
@@ -211,6 +210,7 @@ export class ComposeView extends View {
     }
     BrowserMsg.listen(this.tabId);
     await this.renderModule.initComposeBox();
+    await this.preParseEmailRecipientsIfNeeded();
     if (this.replyOption && this.isReplyBox) {
       await this.renderModule.activateReplyOption(this.replyOption, true);
     }
@@ -272,9 +272,6 @@ export class ComposeView extends View {
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
 
   private preParseEmailRecipientsIfNeeded = async () => {
-    if (this.useFullScreenSecureCompose) {
-      $('body').addClass('full_window');
-    }
     if (this.externalMessageDetails) {
       const messageDetails = JSON.parse(this.externalMessageDetails) as ThunderbirdMessageDetails;
       this.S.cached('input_subject').val(messageDetails.subject);

From 67fddc95bf9a085b45bb56e06e39396e48d382cc Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 20 Jun 2024 13:25:54 +0800
Subject: [PATCH 21/78] wip: fix failing test

---
 .../elements/compose-modules/compose-draft-module.ts   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts
index 914c08c27b8..f360fefb5d7 100644
--- a/extension/chrome/elements/compose-modules/compose-draft-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts
@@ -38,6 +38,11 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
 
   public constructor(composer: ComposeView) {
     super(composer);
+    // Only start draft timer when draft id is not set.
+    // When draft id is set, draft timer will start only when draft is decrypted successfully
+    if (!this.view.disableDraftSaving && !this.view.draftId) {
+      this.startDraftTimer();
+    }
   }
 
   public setHandlers = () => {
@@ -121,11 +126,6 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
     if (this.disableSendingDrafts) {
       return;
     }
-    // Only start draft timer when draft id is not set.
-    // When draft id is set, draft timer will start only when draft is decrypted successfully
-    if (!this.view.disableDraftSaving && !this.view.draftId) {
-      this.startDraftTimer();
-    }
     if (this.hasBodyChanged(this.view.inputModule.squire.getHTML()) || this.hasSubjectChanged(String(this.view.S.cached('input_subject').val())) || forceSave) {
       this.currentlySavingDraft = true;
       try {

From d34a28ad144dda6edc8bc7725ee8c64c4e14339b Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 20 Jun 2024 13:56:11 +0800
Subject: [PATCH 22/78] Fix: unexpected draft creation during secure compose
 prefill

---
 .../chrome/elements/compose-modules/compose-draft-module.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts
index f360fefb5d7..89d8d027af5 100644
--- a/extension/chrome/elements/compose-modules/compose-draft-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts
@@ -40,7 +40,7 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
     super(composer);
     // Only start draft timer when draft id is not set.
     // When draft id is set, draft timer will start only when draft is decrypted successfully
-    if (!this.view.disableDraftSaving && !this.view.draftId) {
+    if (!this.view.disableDraftSaving && !this.view.draftId && !this.view.externalMessageDetails) {
       this.startDraftTimer();
     }
   }

From 478f8649c2f7e98166215e5fdde074adf216180f Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 20 Jun 2024 17:03:33 +0800
Subject: [PATCH 23/78] wip: Render quoted plain text email when possible

---
 .../compose-modules/compose-quote-module.ts    | 18 +++++++++---------
 .../elements/compose-modules/compose-types.ts  |  1 +
 extension/chrome/elements/compose.ts           | 17 +++++++++++++++--
 extension/js/common/browser/browser-msg.ts     |  3 ++-
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index 9805417228d..25379e3a37b 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -37,6 +37,15 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     this.actionRenderTripleDotContentHandle(this.view.S.cached('triple_dot')[0]);
   };
 
+  public actionRenderTripleDotContentHandle = (el: HTMLElement) => {
+    $(el).remove();
+    const inputEl = this.view.S.cached('input_text');
+    Xss.sanitizeAppend(inputEl, this.getTripleDotSanitizedFormattedHtmlContent());
+    this.view.draftModule.setLastDraftBody(inputEl.html());
+    this.tripleDotSanitizedHtmlContent = undefined;
+    this.view.sizeModule.resizeComposeBox();
+  };
+
   public addTripleDotQuoteExpandFooterAndQuoteBtn = async (msgId: string, method: 'reply' | 'forward', forceReload = false) => {
     if (!this.messageToReplyOrForward || forceReload) {
       this.view.S.cached('triple_dot').addClass('progress');
@@ -230,15 +239,6 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
-  private actionRenderTripleDotContentHandle = (el: HTMLElement) => {
-    $(el).remove();
-    const inputEl = this.view.S.cached('input_text');
-    Xss.sanitizeAppend(inputEl, this.getTripleDotSanitizedFormattedHtmlContent());
-    this.view.draftModule.setLastDraftBody(inputEl.html());
-    this.tripleDotSanitizedHtmlContent = undefined;
-    this.view.sizeModule.resizeComposeBox();
-  };
-
   private setQuoteLoaderProgress = (percentOrString: string | number | undefined): void => {
     if (percentOrString) {
       this.view.S.cached('triple_dot')
diff --git a/extension/chrome/elements/compose-modules/compose-types.ts b/extension/chrome/elements/compose-modules/compose-types.ts
index 303e5a8a6d8..53d378b4c4f 100644
--- a/extension/chrome/elements/compose-modules/compose-types.ts
+++ b/extension/chrome/elements/compose-modules/compose-types.ts
@@ -50,6 +50,7 @@ export interface ThunderbirdMessageDetails {
   to?: string[];
   cc?: string[];
   bcc?: string[];
+  plainTextBody?: string;
 }
 
 export type MessageToReplyOrForward = {
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index c77142fc16f..65907688778 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -7,7 +7,7 @@ import { Assert } from '../../js/common/assert.js';
 import { Bm, BrowserMsg } from '../../js/common/browser/browser-msg.js';
 import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js';
 import { Ui } from '../../js/common/browser/ui.js';
-import { PromiseCancellation, Url } from '../../js/common/core/common.js';
+import { PromiseCancellation, Str, Url } from '../../js/common/core/common.js';
 import { View } from '../../js/common/view.js';
 import { XssSafeFactory } from '../../js/common/xss-safe-factory.js';
 import { opgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
@@ -272,8 +272,21 @@ export class ComposeView extends View {
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
 
   private preParseEmailRecipientsIfNeeded = async () => {
+    const messageDetails = JSON.parse(this.externalMessageDetails) as ThunderbirdMessageDetails;
+    if (messageDetails.plainTextBody) {
+      // Thunderbird already returns a standard quoted plain text body
+      const quotedPlainTextBody = messageDetails.plainTextBody;
+      const rtl = messageDetails.plainTextBody.match(new RegExp('[' + Str.rtlChars + ']'));
+      const dirAttr = `dir="${rtl ? 'rtl' : 'ltr'}"`;
+      const footer = await this.footerModule.getFooterFromStorage(this.senderModule.getSender());
+      const sanitizedFooter = footer ? this.footerModule.createFooterHtml(footer) : undefined;
+      this.quoteModule.tripleDotSanitizedHtmlContent = {
+        quote: `<blockquote ${dirAttr}>${quotedPlainTextBody}</blockquote>`, // xss-safe-value
+        footer: sanitizedFooter, // xss-sanitized
+      };
+      this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
+    }
     if (this.externalMessageDetails) {
-      const messageDetails = JSON.parse(this.externalMessageDetails) as ThunderbirdMessageDetails;
       this.S.cached('input_subject').val(messageDetails.subject);
       const { to = [], cc = [], bcc = [] } = messageDetails;
       if (to.length || cc.length || bcc.length) {
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 73c9a6623fb..d52b362328b 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -401,9 +401,10 @@ export class BrowserMsg {
             useFullScreenSecureCompose: true,
             messageDetails: {
               subject: messageDetails.subject,
-              to: messageDetails?.to || '',
+              to: messageDetails?.to,
               cc: messageDetails?.cc || messageDetails?.ccList,
               bcc: messageDetails?.bcc || messageDetails?.bccList,
+              plainTextBody: messageDetails?.plainTextBody || '',
             },
           };
           await BgUtils.openExtensionTab(

From c66c4d712f64a3578ec46ac7301ccf732492ce69 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 20 Jun 2024 18:42:42 +0800
Subject: [PATCH 24/78] wip: Apply UI improvement and fixes

---
 extension/chrome/elements/compose.ts | 3 ++-
 extension/css/cryptup.css            | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 65907688778..5decbe89cf9 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -281,10 +281,11 @@ export class ComposeView extends View {
       const footer = await this.footerModule.getFooterFromStorage(this.senderModule.getSender());
       const sanitizedFooter = footer ? this.footerModule.createFooterHtml(footer) : undefined;
       this.quoteModule.tripleDotSanitizedHtmlContent = {
-        quote: `<blockquote ${dirAttr}>${quotedPlainTextBody}</blockquote>`, // xss-safe-value
+        quote: `<blockquote ${dirAttr} class="height-0">${quotedPlainTextBody}</blockquote>`, // xss-safe-value
         footer: sanitizedFooter, // xss-sanitized
       };
       this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
+      this.S.cached('password_or_pubkey').height(1);
     }
     if (this.externalMessageDetails) {
       this.S.cached('input_subject').val(messageDetails.subject);
diff --git a/extension/css/cryptup.css b/extension/css/cryptup.css
index f9c42658e0e..0696a3b680a 100644
--- a/extension/css/cryptup.css
+++ b/extension/css/cryptup.css
@@ -1,4 +1,8 @@
 /* © 2016-2018 FlowCrypt Limited. Limitations apply. Contact human@flowcrypt.com */
+.height-0 {
+  height: 0;
+}
+
 .flex {
   display: flex;
 }

From 51c608e86182cb07f43b589cd340eb6e1519dd52 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 20 Jun 2024 18:46:20 +0800
Subject: [PATCH 25/78] wip: Fix failing tests

---
 extension/chrome/elements/compose.ts | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 5decbe89cf9..daa1b9151f7 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -272,22 +272,22 @@ export class ComposeView extends View {
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
 
   private preParseEmailRecipientsIfNeeded = async () => {
-    const messageDetails = JSON.parse(this.externalMessageDetails) as ThunderbirdMessageDetails;
-    if (messageDetails.plainTextBody) {
-      // Thunderbird already returns a standard quoted plain text body
-      const quotedPlainTextBody = messageDetails.plainTextBody;
-      const rtl = messageDetails.plainTextBody.match(new RegExp('[' + Str.rtlChars + ']'));
-      const dirAttr = `dir="${rtl ? 'rtl' : 'ltr'}"`;
-      const footer = await this.footerModule.getFooterFromStorage(this.senderModule.getSender());
-      const sanitizedFooter = footer ? this.footerModule.createFooterHtml(footer) : undefined;
-      this.quoteModule.tripleDotSanitizedHtmlContent = {
-        quote: `<blockquote ${dirAttr} class="height-0">${quotedPlainTextBody}</blockquote>`, // xss-safe-value
-        footer: sanitizedFooter, // xss-sanitized
-      };
-      this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
-      this.S.cached('password_or_pubkey').height(1);
-    }
     if (this.externalMessageDetails) {
+      const messageDetails = JSON.parse(this.externalMessageDetails) as ThunderbirdMessageDetails;
+      if (messageDetails.plainTextBody) {
+        // Thunderbird already returns a standard quoted plain text body
+        const quotedPlainTextBody = messageDetails.plainTextBody;
+        const rtl = messageDetails.plainTextBody.match(new RegExp('[' + Str.rtlChars + ']'));
+        const dirAttr = `dir="${rtl ? 'rtl' : 'ltr'}"`;
+        const footer = await this.footerModule.getFooterFromStorage(this.senderModule.getSender());
+        const sanitizedFooter = footer ? this.footerModule.createFooterHtml(footer) : undefined;
+        this.quoteModule.tripleDotSanitizedHtmlContent = {
+          quote: `<blockquote ${dirAttr} class="height-0">${quotedPlainTextBody}</blockquote>`, // xss-safe-value
+          footer: sanitizedFooter, // xss-sanitized
+        };
+        this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
+        this.S.cached('password_or_pubkey').height(1);
+      }
       this.S.cached('input_subject').val(messageDetails.subject);
       const { to = [], cc = [], bcc = [] } = messageDetails;
       if (to.length || cc.length || bcc.length) {
@@ -297,11 +297,11 @@ export class ComposeView extends View {
         this.S.cached('input_container_cc').val(cc.join(','));
         this.S.cached('input_container_bcc').val(cc.join(','));
       }
-    }
-    const preParsedRecipient = ['#input-container-to', '#input-container-cc', '#input-container-bcc'];
-    for (const inputContainer of preParsedRecipient) {
-      if (String($(inputContainer).find('input').val()).trim().length > 0) {
-        await this.recipientsModule.parseRenderRecipients($(inputContainer).find('input'));
+      const preParsedRecipient = ['#input-container-to', '#input-container-cc', '#input-container-bcc'];
+      for (const inputContainer of preParsedRecipient) {
+        if (String($(inputContainer).find('input').val()).trim().length > 0) {
+          await this.recipientsModule.parseRenderRecipients($(inputContainer).find('input'));
+        }
       }
     }
   };

From d4fedabfa41b6e11e378ead6cb10c8c08566e8ee Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 20 Jun 2024 20:27:23 +0800
Subject: [PATCH 26/78] wip: Revert unnecesary changes made by prettier
 extension


From 5e92f9c3508d28e553b1db5ca92b769ea90d71aa Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 21 Jun 2024 13:38:27 +0800
Subject: [PATCH 27/78] wip: Revert unnecesary changes made by prettier
 extension

---
 extension/js/common/core/crypto/pgp/msg-util.ts | 4 ++--
 extension/js/common/ui/key-import-ui.ts         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts
index 5647ce16d40..087683af734 100644
--- a/extension/js/common/core/crypto/pgp/msg-util.ts
+++ b/extension/js/common/core/crypto/pgp/msg-util.ts
@@ -335,7 +335,7 @@ export class MsgUtil {
       // todo - the `ki.passphrase || ''` used to be `ki.passphrase!` which could have actually allowed an undefined to be passed
       // as fixed currently it appears better, but it may be best to instead check `ki.passphrase && await MsgUtil.decryptKeyFor(...)`
       // but that is a larger change that would require separate PR and testing
-      if ((await MsgUtil.isKeyDecryptedFor(parsed, matchingKeyids)) || (await MsgUtil.decryptKeyFor(parsed, ki.passphrase || '', matchingKeyids))) {
+      if ((await MsgUtil.isKeyDecryptedFor(parsed, matchingKeyids)) || await MsgUtil.decryptKeyFor(parsed, ki.passphrase || '', matchingKeyids)) {
         KeyCache.setDecrypted(parsed);
         keys.prvForDecryptDecrypted.push({ ki, decrypted: parsed });
       } else {
@@ -369,7 +369,7 @@ export class MsgUtil {
         continue;
       }
       const parsed = await KeyUtil.parse(ki.private);
-      if (parsed.fullyDecrypted || (ki.passphrase && (await SmimeKey.decryptKey(parsed, ki.passphrase)))) {
+      if (parsed.fullyDecrypted || (ki.passphrase && await SmimeKey.decryptKey(parsed, ki.passphrase))) {
         KeyCache.setDecrypted(parsed);
         keys.prvForDecryptDecrypted.push({ ki, decrypted: parsed });
       } else {
diff --git a/extension/js/common/ui/key-import-ui.ts b/extension/js/common/ui/key-import-ui.ts
index 45f192e4cda..3a6bedc50b1 100644
--- a/extension/js/common/ui/key-import-ui.ts
+++ b/extension/js/common/ui/key-import-ui.ts
@@ -231,7 +231,11 @@ export class KeyImportUi {
     return normalized;
   };
 
-  public renderPassPhraseStrengthValidationInput = (input: JQuery, submitButton?: JQuery, type: 'passphrase' | 'pwd' = 'passphrase') => {
+  public renderPassPhraseStrengthValidationInput = (
+    input: JQuery,
+    submitButton?: JQuery,
+    type: 'passphrase' | 'pwd' = 'passphrase'
+  ) => {  
     const validationElements = this.getPPValidationElements();
     const setBtnColor = (type: 'gray' | 'green') => {
       if (submitButton) {

From fa9da7fbb82eb65341716adfd49d11c057575d22 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 21 Jun 2024 13:40:37 +0800
Subject: [PATCH 28/78] wip: Revert unintended changes

---
 extension/js/common/ui/key-import-ui.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/js/common/ui/key-import-ui.ts b/extension/js/common/ui/key-import-ui.ts
index 3a6bedc50b1..b359e396988 100644
--- a/extension/js/common/ui/key-import-ui.ts
+++ b/extension/js/common/ui/key-import-ui.ts
@@ -235,7 +235,7 @@ export class KeyImportUi {
     input: JQuery,
     submitButton?: JQuery,
     type: 'passphrase' | 'pwd' = 'passphrase'
-  ) => {  
+  ) => {
     const validationElements = this.getPPValidationElements();
     const setBtnColor = (type: 'gray' | 'green') => {
       if (submitButton) {

From 3a8285852c868bacd37f5aadff7c260750735cab Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 21 Jun 2024 13:41:30 +0800
Subject: [PATCH 29/78] cleanup

---
 extension/js/common/browser/browser-msg.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 404307b93a4..94b63d924b2 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -467,7 +467,6 @@ export class BrowserMsg {
           await actionType.setPopup({ popup: Url.create('/chrome/popups/default.htm', { tabId }) });
           await actionType.openPopup();
         } else {
-          // todo: pass quoted email when replying using secure compose
           const messageDetails = (await browserApiMethod(tabId)) as MessageDetails;
           const inboxPageParams = {
             useFullScreenSecureCompose: true,

From 38b6808710663845286bd77bb64d1e3b47c7e9a8 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 21 Jun 2024 14:34:11 +0800
Subject: [PATCH 30/78] wip: remove service_worker in Thunderbird manifest.json

---
 tooling/build-types-and-manifests.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts
index 9abae15f462..ac41434c9a7 100644
--- a/tooling/build-types-and-manifests.ts
+++ b/tooling/build-types-and-manifests.ts
@@ -75,6 +75,11 @@ addManifest(
       default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention
     };
     (manifest.browser_specific_settings as browser._manifest.FirefoxSpecificProperties).strict_min_version = '102.0';
+    delete manifest.background;
+    manifest.background = {
+      type: 'module',
+      scripts: ['/js/service_worker/background.js'],
+    };
   },
   'firefox-consumer'
 );

From 21f9c987fa25a2f4777ce948258f06c76dd281f9 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 21 Jun 2024 14:41:41 +0800
Subject: [PATCH 31/78] wip

---
 extension/chrome/popups/default.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/popups/default.ts b/extension/chrome/popups/default.ts
index 66480791779..df506f39567 100644
--- a/extension/chrome/popups/default.ts
+++ b/extension/chrome/popups/default.ts
@@ -26,7 +26,7 @@ View.run(
       const activeTab = await BrowserMsg.send.bg.await.getActiveTabInfo();
       if (Catch.isThunderbirdMail()) {
         const windowInfo = await browser.windows.getCurrent();
-        if (windowInfo.type === 'messageCompose') {
+        if (windowInfo.type === 'messageCompose' || windowInfo.type === 'messageDisplay') {
           $('.action_open_settings').hide();
           $('.action_open_encrypted_inbox').parent().css('margin-right', '0');
           $('.action_open_encrypted_inbox').text('Secure Compose');

From 20eea32cbf4e7d19b1cb2bf2c343fb43f93b769d Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 21 Jun 2024 16:48:36 +0800
Subject: [PATCH 32/78] wip: Enable quoted email rendering for multiple account

---
 extension/chrome/elements/compose.ts       |  4 +---
 extension/chrome/popups/select_account.ts  | 14 +++++++----
 extension/js/common/browser/browser-msg.ts | 27 ++++++++++++----------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index daa1b9151f7..173616f4823 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -279,11 +279,9 @@ export class ComposeView extends View {
         const quotedPlainTextBody = messageDetails.plainTextBody;
         const rtl = messageDetails.plainTextBody.match(new RegExp('[' + Str.rtlChars + ']'));
         const dirAttr = `dir="${rtl ? 'rtl' : 'ltr'}"`;
-        const footer = await this.footerModule.getFooterFromStorage(this.senderModule.getSender());
-        const sanitizedFooter = footer ? this.footerModule.createFooterHtml(footer) : undefined;
         this.quoteModule.tripleDotSanitizedHtmlContent = {
           quote: `<blockquote ${dirAttr} class="height-0">${quotedPlainTextBody}</blockquote>`, // xss-safe-value
-          footer: sanitizedFooter, // xss-sanitized
+          footer: undefined, // no footer needed already pre-rendered by addSignatureToInput
         };
         this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
         this.S.cached('password_or_pubkey').height(1);
diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index a452155b6a9..4a824fface2 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -11,17 +11,20 @@ import { View } from '../../js/common/view.js';
 import { Xss } from '../../js/common/platform/xss.js';
 import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { GlobalStore } from '../../js/common/platform/store/global-store.js';
+import { ThunderbirdMessageDetails } from '../elements/compose-modules/compose-types.js';
 
 View.run(
   class SelectAcctPopupView extends View {
+    public readonly tabId: number;
+    public readonly pageUrlParams: string | undefined;
     private readonly action: 'inbox' | 'settings';
-    private readonly tabId: number;
 
     public constructor() {
       super();
-      const uncheckedUrlParams = Url.parse(['action', 'tabId']);
+      const uncheckedUrlParams = Url.parse(['action', 'tabId', 'pageUrlParams']);
       this.action = Assert.urlParamRequire.oneof(uncheckedUrlParams, 'action', ['inbox', 'settings']);
       this.tabId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'tabId'));
+      this.pageUrlParams = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'pageUrlParams');
     }
 
     public render = async () => {
@@ -58,9 +61,12 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
-      const useFullScreenSecureCompose = Catch.isThunderbirdMail();
+      let pageUrlParams;
+      if (this.pageUrlParams) {
+        pageUrlParams = JSON.parse(this.pageUrlParams) as ThunderbirdMessageDetails;
+      }
       if (this.action === 'inbox') {
-        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, { useFullScreenSecureCompose });
+        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, { ...pageUrlParams });
       } else {
         await Browser.openSettingsPage('index.htm', $(clickedElement).attr('email'));
       }
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 94b63d924b2..4a921fedb7b 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -461,23 +461,26 @@ export class BrowserMsg {
       const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
       const actionType = action === 'compose' ? browser.composeAction : browser.messageDisplayAction;
       const browserApiMethod = action === 'compose' ? browser.compose.getComposeDetails : browser.messageDisplay.getDisplayedMessage;
+      const messageDetails = (await browserApiMethod(tabId)) as MessageDetails;
+      const inboxPageParams = {
+        useFullScreenSecureCompose: true,
+        messageDetails: {
+          subject: messageDetails.subject,
+          to: messageDetails?.to,
+          cc: messageDetails?.cc || messageDetails?.ccList,
+          bcc: messageDetails?.bcc || messageDetails?.bccList,
+          plainTextBody: messageDetails?.plainTextBody || '',
+        },
+      };
       if (accountEmails) {
         const accounts = JSON.parse(accountEmails) as string[];
+        console.log(accounts);
         if (accounts.length > 1) {
-          await actionType.setPopup({ popup: Url.create('/chrome/popups/default.htm', { tabId }) });
+          await actionType.setPopup({
+            popup: Url.create('/chrome/popups/select_account.htm', { action: 'inbox', tabId, pageUrlParams: JSON.stringify(inboxPageParams) }),
+          });
           await actionType.openPopup();
         } else {
-          const messageDetails = (await browserApiMethod(tabId)) as MessageDetails;
-          const inboxPageParams = {
-            useFullScreenSecureCompose: true,
-            messageDetails: {
-              subject: messageDetails.subject,
-              to: messageDetails?.to,
-              cc: messageDetails?.cc || messageDetails?.ccList,
-              bcc: messageDetails?.bcc || messageDetails?.bccList,
-              plainTextBody: messageDetails?.plainTextBody || '',
-            },
-          };
           await BgUtils.openExtensionTab(
             Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify(inboxPageParams) })
           );

From 1f968a4ad03e96c8696fa00ab9dabea8d86b34d6 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 21 Jun 2024 16:51:21 +0800
Subject: [PATCH 33/78] cleanup: Remove unncessary code since secure compose is
 now straight forward

---
 extension/chrome/popups/default.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/extension/chrome/popups/default.ts b/extension/chrome/popups/default.ts
index df506f39567..63bf23e7138 100644
--- a/extension/chrome/popups/default.ts
+++ b/extension/chrome/popups/default.ts
@@ -24,14 +24,6 @@ View.run(
 
     public render = async () => {
       const activeTab = await BrowserMsg.send.bg.await.getActiveTabInfo();
-      if (Catch.isThunderbirdMail()) {
-        const windowInfo = await browser.windows.getCurrent();
-        if (windowInfo.type === 'messageCompose' || windowInfo.type === 'messageDisplay') {
-          $('.action_open_settings').hide();
-          $('.action_open_encrypted_inbox').parent().css('margin-right', '0');
-          $('.action_open_encrypted_inbox').text('Secure Compose');
-        }
-      }
       if (activeTab?.acctEmail) {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         const { setup_done } = await AcctStore.get(activeTab.acctEmail, ['setup_done']);

From 676802aa11b42f371b5fef9e4d558b02c0f241d0 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Sat, 22 Jun 2024 16:08:50 +0800
Subject: [PATCH 34/78] Pr review: redirecting from messageDisplay include
 email rendering if threadId is set

---
 .../elements/compose-modules/compose-types.ts |  1 +
 extension/chrome/popups/select_account.ts     | 31 ++++++++++++++-----
 extension/chrome/settings/inbox/inbox.ts      |  2 +-
 .../api/email-provider/gmail/gmail-parser.ts  |  9 ++++++
 .../common/api/email-provider/gmail/gmail.ts  |  4 +++
 extension/js/common/browser/browser-msg.ts    |  2 +-
 6 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-types.ts b/extension/chrome/elements/compose-modules/compose-types.ts
index 53d378b4c4f..76af9ab2652 100644
--- a/extension/chrome/elements/compose-modules/compose-types.ts
+++ b/extension/chrome/elements/compose-modules/compose-types.ts
@@ -51,6 +51,7 @@ export interface ThunderbirdMessageDetails {
   cc?: string[];
   bcc?: string[];
   plainTextBody?: string;
+  headerMessageId?: string;
 }
 
 export type MessageToReplyOrForward = {
diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index 4a824fface2..3ece4eaeb94 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -6,17 +6,23 @@ import { Assert } from '../../js/common/assert.js';
 import { Browser } from '../../js/common/browser/browser.js';
 import { Catch } from '../../js/common/platform/catch.js';
 import { Time } from '../../js/common/browser/time.js';
-import { Url } from '../../js/common/core/common.js';
+import { Url, UrlParams } from '../../js/common/core/common.js';
 import { View } from '../../js/common/view.js';
 import { Xss } from '../../js/common/platform/xss.js';
 import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { GlobalStore } from '../../js/common/platform/store/global-store.js';
 import { ThunderbirdMessageDetails } from '../elements/compose-modules/compose-types.js';
+import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js';
 
 View.run(
   class SelectAcctPopupView extends View {
     public readonly tabId: number;
-    public readonly pageUrlParams: string | undefined;
+    public readonly pageUrlParams?:
+      | {
+          useFullScreenSecureCompose?: boolean;
+          messageDetails?: ThunderbirdMessageDetails;
+        }
+      | undefined;
     private readonly action: 'inbox' | 'settings';
 
     public constructor() {
@@ -24,7 +30,7 @@ View.run(
       const uncheckedUrlParams = Url.parse(['action', 'tabId', 'pageUrlParams']);
       this.action = Assert.urlParamRequire.oneof(uncheckedUrlParams, 'action', ['inbox', 'settings']);
       this.tabId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'tabId'));
-      this.pageUrlParams = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'pageUrlParams');
+      this.pageUrlParams = typeof uncheckedUrlParams.pageUrlParams === 'string' ? (JSON.parse(uncheckedUrlParams.pageUrlParams) as UrlParams) : undefined;
     }
 
     public render = async () => {
@@ -61,14 +67,23 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
-      let pageUrlParams;
-      if (this.pageUrlParams) {
-        pageUrlParams = JSON.parse(this.pageUrlParams) as ThunderbirdMessageDetails;
+      const acctEmail = $(clickedElement).attr('email') || '';
+      let threadId: string | undefined;
+      if (this.pageUrlParams?.messageDetails) {
+        const gmail = new Gmail(acctEmail);
+        const headerMessageId = this.pageUrlParams.messageDetails?.headerMessageId || '';
+        const gmailRes = await gmail.threadIdGet(headerMessageId);
+        const missingThreadIdMsg =
+          "The email you're attempting to reply to is not accessible for the chosen account. Please ensure that you select the appropriate account to continue.";
+        if (!gmailRes?.messages) {
+          return alert(missingThreadIdMsg);
+        }
+        threadId = gmailRes.messages[0].threadId;
       }
       if (this.action === 'inbox') {
-        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'), undefined, { ...pageUrlParams });
+        await Browser.openExtensionTab(Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, threadId }));
       } else {
-        await Browser.openSettingsPage('index.htm', $(clickedElement).attr('email'));
+        await Browser.openSettingsPage('index.htm', acctEmail);
       }
       await Time.sleep(100);
       if (this.tabId) {
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index a1129c8fe6e..32e30d8256a 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -37,7 +37,7 @@ export class InboxView extends View {
   public readonly threadId: string | undefined;
   public readonly showOriginal: boolean;
   public readonly debug: boolean;
-  public pageUrlParams:
+  public pageUrlParams?:
     | {
         useFullScreenSecureCompose?: boolean;
         messageDetails?: ThunderbirdMessageDetails;
diff --git a/extension/js/common/api/email-provider/gmail/gmail-parser.ts b/extension/js/common/api/email-provider/gmail/gmail-parser.ts
index 5e44edddf81..3acc19f7ddd 100644
--- a/extension/js/common/api/email-provider/gmail/gmail-parser.ts
+++ b/extension/js/common/api/email-provider/gmail/gmail-parser.ts
@@ -65,6 +65,15 @@ export namespace GmailRes {
     nextPageToken: string;
     resultSizeEstimate: number;
   };
+  export type GmailThreadIdQuery =
+    | {
+        messages?: {
+          id: string;
+          threadId: string;
+        }[];
+        resultSizeEstimate: number;
+      }
+    | undefined;
   export type GmailDraftCreate = { id: string };
   export type GmailDraftDelete = {}; // eslint-disable-line @typescript-eslint/ban-types
   export type GmailDraftUpdate = {}; // eslint-disable-line @typescript-eslint/ban-types
diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts
index 42b1b4929b9..c7518a3a17e 100644
--- a/extension/js/common/api/email-provider/gmail/gmail.ts
+++ b/extension/js/common/api/email-provider/gmail/gmail.ts
@@ -33,6 +33,10 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface {
     }
   };
 
+  public threadIdGet = async (messageId: string): Promise<GmailRes.GmailThreadIdQuery> => {
+    return await Google.gmailCall<GmailRes.GmailThreadIdQuery>(this.acctEmail, 'messages', { method: 'GET', data: { q: `rfc822msgid:${messageId}` } });
+  };
+
   public threadGet = async (threadId: string, format?: GmailResponseFormat, progressCb?: ProgressCb): Promise<GmailRes.GmailThread> => {
     return await Google.gmailCall<GmailRes.GmailThread>(this.acctEmail, `threads/${threadId}`, { method: 'GET', data: { format } }, { download: progressCb });
   };
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 4a921fedb7b..9201310ed58 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -470,11 +470,11 @@ export class BrowserMsg {
           cc: messageDetails?.cc || messageDetails?.ccList,
           bcc: messageDetails?.bcc || messageDetails?.bccList,
           plainTextBody: messageDetails?.plainTextBody || '',
+          headerMessageId: messageDetails?.headerMessageId || '',
         },
       };
       if (accountEmails) {
         const accounts = JSON.parse(accountEmails) as string[];
-        console.log(accounts);
         if (accounts.length > 1) {
           await actionType.setPopup({
             popup: Url.create('/chrome/popups/select_account.htm', { action: 'inbox', tabId, pageUrlParams: JSON.stringify(inboxPageParams) }),

From 0b16521c722b31f3a9c34a021a4726535d9969e3 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 25 Jun 2024 19:20:59 +0800
Subject: [PATCH 35/78] wip: refactor

---
 extension/js/common/browser/browser-msg.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 9201310ed58..5cb15070f3d 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -462,8 +462,9 @@ export class BrowserMsg {
       const actionType = action === 'compose' ? browser.composeAction : browser.messageDisplayAction;
       const browserApiMethod = action === 'compose' ? browser.compose.getComposeDetails : browser.messageDisplay.getDisplayedMessage;
       const messageDetails = (await browserApiMethod(tabId)) as MessageDetails;
-      const inboxPageParams = {
-        useFullScreenSecureCompose: true,
+      const windowType = (await browser.windows.getCurrent()).type;
+      const urlPageParams = {
+        useFullScreenSecureCompose: windowType === 'messageCompose',
         messageDetails: {
           subject: messageDetails.subject,
           to: messageDetails?.to,
@@ -477,12 +478,12 @@ export class BrowserMsg {
         const accounts = JSON.parse(accountEmails) as string[];
         if (accounts.length > 1) {
           await actionType.setPopup({
-            popup: Url.create('/chrome/popups/select_account.htm', { action: 'inbox', tabId, pageUrlParams: JSON.stringify(inboxPageParams) }),
+            popup: Url.create('/chrome/popups/select_account.htm', { action: 'inbox', tabId, pageUrlParams: JSON.stringify(urlPageParams) }),
           });
           await actionType.openPopup();
         } else {
           await BgUtils.openExtensionTab(
-            Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify(inboxPageParams) })
+            Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify(urlPageParams) })
           );
           await browser.tabs.remove(tabId);
         }

From 10865da3b378b2c888d623d71d18bc07dd3d66e4 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 25 Jun 2024 20:31:03 +0800
Subject: [PATCH 36/78] wip: refactor

---
 extension/chrome/popups/select_account.ts | 29 ++++-------------------
 extension/chrome/settings/inbox/inbox.ts  | 16 +++++++++++++
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index 3ece4eaeb94..e0f086ccaf5 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -6,23 +6,16 @@ import { Assert } from '../../js/common/assert.js';
 import { Browser } from '../../js/common/browser/browser.js';
 import { Catch } from '../../js/common/platform/catch.js';
 import { Time } from '../../js/common/browser/time.js';
-import { Url, UrlParams } from '../../js/common/core/common.js';
+import { Url } from '../../js/common/core/common.js';
 import { View } from '../../js/common/view.js';
 import { Xss } from '../../js/common/platform/xss.js';
 import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { GlobalStore } from '../../js/common/platform/store/global-store.js';
-import { ThunderbirdMessageDetails } from '../elements/compose-modules/compose-types.js';
-import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js';
 
 View.run(
   class SelectAcctPopupView extends View {
-    public readonly tabId: number;
-    public readonly pageUrlParams?:
-      | {
-          useFullScreenSecureCompose?: boolean;
-          messageDetails?: ThunderbirdMessageDetails;
-        }
-      | undefined;
+    private readonly tabId?: number;
+    private readonly pageUrlParams?: string;
     private readonly action: 'inbox' | 'settings';
 
     public constructor() {
@@ -30,7 +23,7 @@ View.run(
       const uncheckedUrlParams = Url.parse(['action', 'tabId', 'pageUrlParams']);
       this.action = Assert.urlParamRequire.oneof(uncheckedUrlParams, 'action', ['inbox', 'settings']);
       this.tabId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'tabId'));
-      this.pageUrlParams = typeof uncheckedUrlParams.pageUrlParams === 'string' ? (JSON.parse(uncheckedUrlParams.pageUrlParams) as UrlParams) : undefined;
+      this.pageUrlParams = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'pageUrlParams');
     }
 
     public render = async () => {
@@ -68,20 +61,8 @@ View.run(
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
       const acctEmail = $(clickedElement).attr('email') || '';
-      let threadId: string | undefined;
-      if (this.pageUrlParams?.messageDetails) {
-        const gmail = new Gmail(acctEmail);
-        const headerMessageId = this.pageUrlParams.messageDetails?.headerMessageId || '';
-        const gmailRes = await gmail.threadIdGet(headerMessageId);
-        const missingThreadIdMsg =
-          "The email you're attempting to reply to is not accessible for the chosen account. Please ensure that you select the appropriate account to continue.";
-        if (!gmailRes?.messages) {
-          return alert(missingThreadIdMsg);
-        }
-        threadId = gmailRes.messages[0].threadId;
-      }
       if (this.action === 'inbox') {
-        await Browser.openExtensionTab(Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, threadId }));
+        await Browser.openExtensionTab(Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, pageUrlParams: this.pageUrlParams }));
       } else {
         await Browser.openSettingsPage('index.htm', acctEmail);
       }
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 32e30d8256a..be9f25eae4e 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -90,8 +90,12 @@ export class InboxView extends View {
         $('body').text('Not supported for ' + emailProvider);
       } else {
         await this.inboxMenuModule.render();
+        const headerMessageId = this.pageUrlParams?.messageDetails?.headerMessageId;
+        const parsedThreadId = await this.parseThreadIdFromMessageId(headerMessageId);
         if (this.threadId) {
           await this.inboxActiveThreadModule.render(this.threadId);
+        } else if (parsedThreadId) {
+          await this.inboxActiveThreadModule.render(parsedThreadId);
         } else {
           await this.inboxListThreadsModule.render(this.labelId);
         }
@@ -150,6 +154,18 @@ export class InboxView extends View {
     }
   };
 
+  private parseThreadIdFromMessageId = async (headerMessageId?: string) => {
+    let threadId;
+    if (headerMessageId) {
+      const gmail = new Gmail(this.acctEmail);
+      const gmailRes = await gmail.threadIdGet(headerMessageId);
+      if (gmailRes?.messages) {
+        threadId = gmailRes.messages[0].threadId;
+      }
+    }
+    return threadId;
+  };
+
   private addBrowserMsgListeners = () => {
     BrowserMsg.addListener('add_end_session_btn', () => this.injector.insertEndSessionBtn(this.acctEmail));
     BrowserMsg.addListener('set_active_window', async ({ frameId }: Bm.ComposeWindow) => {

From c9b148d9dc5c5fe0f54f5f9f134c5575db5f53d7 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 26 Jun 2024 18:48:43 +0800
Subject: [PATCH 37/78] wip: refactor

---
 .../compose-modules/compose-draft-module.ts   |  2 +-
 .../compose-modules/compose-quote-module.ts   | 14 ++---
 .../elements/compose-modules/compose-types.ts |  1 -
 extension/chrome/elements/compose.ts          | 26 +++++++---
 extension/chrome/settings/inbox/inbox.ts      | 40 +++++++-------
 extension/js/common/browser/browser-msg.ts    | 52 ++++++-------------
 extension/js/common/inject.ts                 |  5 +-
 extension/js/common/xss-safe-factory.ts       | 10 ++--
 tooling/build-types-and-manifests.ts          |  2 +-
 9 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts
index 566064e0298..a44e453de73 100644
--- a/extension/chrome/elements/compose-modules/compose-draft-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts
@@ -40,7 +40,7 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
     super(composer);
     // Only start draft timer when draft id is not set.
     // When draft id is set, draft timer will start only when draft is decrypted successfully
-    if (!this.view.disableDraftSaving && !this.view.draftId && !this.view.externalMessageDetails) {
+    if (!this.view.disableDraftSaving && !this.view.draftId && !this.view.thunderbirdMsgId) {
       this.startDraftTimer();
     }
   }
diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index a76f037929f..1fb97548c96 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -85,6 +85,13 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
+  public convertLineBreakToBr = (text: string, shouldQuote: boolean) => {
+    return text
+      .split('\n')
+      .map(line => `<br>${shouldQuote ? '&gt; ' : ''}${line}`.trim())
+      .join('');
+  };
+
   private getAndDecryptMessage = async (msgId: string, method: 'reply' | 'forward'): Promise<MessageToReplyOrForward | undefined> => {
     try {
       const { raw } = await this.view.emailProvider.msgGet(msgId, 'raw', progress => this.setQuoteLoaderProgress(progress));
@@ -203,13 +210,6 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
-  private convertLineBreakToBr = (text: string, shouldQuote: boolean) => {
-    return text
-      .split('\n')
-      .map(line => `<br>${shouldQuote ? '&gt; ' : ''}${line}`.trim())
-      .join('');
-  };
-
   private generateHtmlPreviousMsgQuote = (method: 'reply' | 'forward') => {
     if (!this.messageToReplyOrForward?.text || !this.messageToReplyOrForward.headers.date) {
       return;
diff --git a/extension/chrome/elements/compose-modules/compose-types.ts b/extension/chrome/elements/compose-modules/compose-types.ts
index 76af9ab2652..53d378b4c4f 100644
--- a/extension/chrome/elements/compose-modules/compose-types.ts
+++ b/extension/chrome/elements/compose-modules/compose-types.ts
@@ -51,7 +51,6 @@ export interface ThunderbirdMessageDetails {
   cc?: string[];
   bcc?: string[];
   plainTextBody?: string;
-  headerMessageId?: string;
 }
 
 export type MessageToReplyOrForward = {
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 173616f4823..00b72ed2c5b 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -46,7 +46,7 @@ export class ComposeView extends View {
   public readonly isReplyBox: boolean;
   public readonly replyMsgId: string;
   public readonly replyPubkeyMismatch: boolean;
-  public readonly externalMessageDetails: string;
+  public readonly thunderbirdMsgId: number;
   public replyOption?: ReplyOption;
   public fesUrl?: string;
   public skipClickPrompt: boolean;
@@ -154,7 +154,7 @@ export class ComposeView extends View {
       'replyPubkeyMismatch',
       'replyOption',
       'useFullScreenSecureCompose',
-      'externalMessageDetails',
+      'thunderbirdMsgId',
     ]);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId');
@@ -169,7 +169,7 @@ export class ComposeView extends View {
     this.draftId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'draftId') || '';
     this.replyMsgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'replyMsgId') || '';
     this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
-    this.externalMessageDetails = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'externalMessageDetails') || '';
+    this.thunderbirdMsgId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'thunderbirdMsgId'));
     this.isReplyBox = !!this.replyMsgId;
     this.emailProvider = new Gmail(this.acctEmail);
     this.acctServer = new AccountServer(this.acctEmail);
@@ -272,11 +272,23 @@ export class ComposeView extends View {
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
 
   private preParseEmailRecipientsIfNeeded = async () => {
-    if (this.externalMessageDetails) {
-      const messageDetails = JSON.parse(this.externalMessageDetails) as ThunderbirdMessageDetails;
+    if (Catch.isThunderbirdMail() && this.thunderbirdMsgId) {
+      const thunderbirdMimeMsg = await browser.messages.getFull(this.thunderbirdMsgId);
+      let plainTextBody;
+      if (thunderbirdMimeMsg?.parts?.[0]?.contentType === 'multipart/alternative') {
+        plainTextBody = thunderbirdMimeMsg?.parts?.[0]?.parts?.[0].body;
+      }
+      const messageDetails = {
+        to: thunderbirdMimeMsg.headers?.to,
+        cc: thunderbirdMimeMsg.headers?.cc,
+        bcc: thunderbirdMimeMsg.headers?.bcc,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        subject: thunderbirdMimeMsg.headers!.subject[0],
+        plainTextBody,
+      } as ThunderbirdMessageDetails;
       if (messageDetails.plainTextBody) {
-        // Thunderbird already returns a standard quoted plain text body
-        const quotedPlainTextBody = messageDetails.plainTextBody;
+        // todo: add date details since we are now parsing the MIME message
+        const quotedPlainTextBody = this.quoteModule.convertLineBreakToBr(messageDetails.plainTextBody, true);
         const rtl = messageDetails.plainTextBody.match(new RegExp('[' + Str.rtlChars + ']'));
         const dirAttr = `dir="${rtl ? 'rtl' : 'ltr'}"`;
         this.quoteModule.tripleDotSanitizedHtmlContent = {
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index be9f25eae4e..44d52a60106 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -24,7 +24,6 @@ import { XssSafeFactory } from '../../../js/common/xss-safe-factory.js';
 import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
 import { RelayManager } from '../../../js/common/relay-manager.js';
 import { MessageRenderer } from '../../../js/common/message-renderer.js';
-import { ThunderbirdMessageDetails } from '../../elements/compose-modules/compose-types.js';
 
 export class InboxView extends View {
   public readonly inboxMenuModule: InboxMenuModule;
@@ -37,12 +36,8 @@ export class InboxView extends View {
   public readonly threadId: string | undefined;
   public readonly showOriginal: boolean;
   public readonly debug: boolean;
-  public pageUrlParams?:
-    | {
-        useFullScreenSecureCompose?: boolean;
-        messageDetails?: ThunderbirdMessageDetails;
-      }
-    | undefined;
+  public readonly useFullScreenSecureCompose: boolean;
+  public readonly thunderbirdMsgId: number | undefined;
   public readonly S: SelCache;
   public readonly gmail: Gmail;
 
@@ -56,13 +51,14 @@ export class InboxView extends View {
 
   public constructor() {
     super();
-    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'pageUrlParams']);
+    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'useFullScreenSecureCompose', 'thunderbirdMsgId']);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.labelId = uncheckedUrlParams.labelId ? String(uncheckedUrlParams.labelId) : 'INBOX';
     this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId');
     this.showOriginal = uncheckedUrlParams.showOriginal === true;
     this.debug = uncheckedUrlParams.debug === true;
-    this.pageUrlParams = typeof uncheckedUrlParams.pageUrlParams === 'string' ? (JSON.parse(uncheckedUrlParams.pageUrlParams) as UrlParams) : undefined;
+    this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
+    this.thunderbirdMsgId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'thunderbirdMsgId'));
     this.S = Ui.buildJquerySels({ threads: '.threads', thread: '.thread', body: 'body' });
     this.gmail = new Gmail(this.acctEmail);
     this.inboxMenuModule = new InboxMenuModule(this);
@@ -90,8 +86,7 @@ export class InboxView extends View {
         $('body').text('Not supported for ' + emailProvider);
       } else {
         await this.inboxMenuModule.render();
-        const headerMessageId = this.pageUrlParams?.messageDetails?.headerMessageId;
-        const parsedThreadId = await this.parseThreadIdFromMessageId(headerMessageId);
+        const parsedThreadId = await this.parseThreadIdFromHeaderMessageId();
         if (this.threadId) {
           await this.inboxActiveThreadModule.render(this.threadId);
         } else if (parsedThreadId) {
@@ -149,18 +144,25 @@ export class InboxView extends View {
   };
 
   private preRenderSecureComposeInFullScreen = () => {
-    if (this.pageUrlParams?.useFullScreenSecureCompose) {
-      this.injector.openComposeWin(undefined, true, this.pageUrlParams.messageDetails);
+    if (this.useFullScreenSecureCompose && this.thunderbirdMsgId) {
+      this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId);
     }
   };
 
-  private parseThreadIdFromMessageId = async (headerMessageId?: string) => {
+  private parseThreadIdFromHeaderMessageId = async () => {
     let threadId;
-    if (headerMessageId) {
-      const gmail = new Gmail(this.acctEmail);
-      const gmailRes = await gmail.threadIdGet(headerMessageId);
-      if (gmailRes?.messages) {
-        threadId = gmailRes.messages[0].threadId;
+    const tbMsgId = Number(this.thunderbirdMsgId);
+    if (Catch.isThunderbirdMail() && tbMsgId && !this.useFullScreenSecureCompose) {
+      const thunderbirdFullMsg = await browser.messages.getFull(tbMsgId);
+      if (thunderbirdFullMsg.headers) {
+        const messageId = thunderbirdFullMsg.headers['message-id'][0];
+        if (messageId) {
+          const gmail = new Gmail(this.acctEmail);
+          const gmailRes = await gmail.threadIdGet(messageId);
+          if (gmailRes?.messages) {
+            threadId = gmailRes.messages[0].threadId;
+          }
+        }
       }
     }
     return threadId;
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 5cb15070f3d..7913905c52a 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -20,7 +20,6 @@ import { Ajax as ApiAjax, ResFmt } from '../api/shared/api.js';
 import { Ui } from './ui.js';
 import { GlobalStore } from '../platform/store/global-store.js';
 import { BgUtils } from '../../service_worker/bgutils.js';
-import { ThunderbirdMessageDetails } from '../../../chrome/elements/compose-modules/compose-types.js';
 
 export type GoogleAuthWindowResult$result = 'Success' | 'Denied' | 'Error' | 'Closed';
 export type ScreenDimensions = { width: number; height: number; availLeft: number; availTop: number };
@@ -453,49 +452,32 @@ export class BrowserMsg {
   }
 
   public static thunderbirdSecureComposeHandler() {
-    interface MessageDetails extends ThunderbirdMessageDetails {
-      bccList?: string[];
-      ccList?: string[];
-    }
-    const handleClickEvent = async (tabId: number, action = 'compose' || 'message_display') => {
+    const handleClickEvent = async (tabId: number, acctEmail: string, thunderbirdMsgId: number) => {
       const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
-      const actionType = action === 'compose' ? browser.composeAction : browser.messageDisplayAction;
-      const browserApiMethod = action === 'compose' ? browser.compose.getComposeDetails : browser.messageDisplay.getDisplayedMessage;
-      const messageDetails = (await browserApiMethod(tabId)) as MessageDetails;
-      const windowType = (await browser.windows.getCurrent()).type;
-      const urlPageParams = {
-        useFullScreenSecureCompose: windowType === 'messageCompose',
-        messageDetails: {
-          subject: messageDetails.subject,
-          to: messageDetails?.to,
-          cc: messageDetails?.cc || messageDetails?.ccList,
-          bcc: messageDetails?.bcc || messageDetails?.bccList,
-          plainTextBody: messageDetails?.plainTextBody || '',
-          headerMessageId: messageDetails?.headerMessageId || '',
-        },
-      };
+      const useFullScreenSecureCompose = (await browser.windows.getCurrent()).type === 'messageCompose';
       if (accountEmails) {
-        const accounts = JSON.parse(accountEmails) as string[];
-        if (accounts.length > 1) {
-          await actionType.setPopup({
-            popup: Url.create('/chrome/popups/select_account.htm', { action: 'inbox', tabId, pageUrlParams: JSON.stringify(urlPageParams) }),
-          });
-          await actionType.openPopup();
-        } else {
-          await BgUtils.openExtensionTab(
-            Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: accounts[0], pageUrlParams: JSON.stringify(urlPageParams) })
-          );
-          await browser.tabs.remove(tabId);
-        }
+        await BgUtils.openExtensionTab(Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, useFullScreenSecureCompose, thunderbirdMsgId }));
+        await browser.tabs.remove(tabId);
       } else {
         await BgUtils.openExtensionTab(Url.create('/chrome/settings/initial.htm', {}));
       }
     };
     browser.composeAction.onClicked.addListener(async tab => {
-      await handleClickEvent(Number(tab.id), 'compose');
+      const messageDetails = await browser.compose.getComposeDetails(Number(tab.id));
+      const msgId = Number(messageDetails.relatedMessageId);
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const acctEmail = Str.parseEmail(messageDetails.from as string).email!;
+      await handleClickEvent(Number(tab.id), acctEmail, msgId);
     });
     browser.messageDisplayAction.onClicked.addListener(async tab => {
-      await handleClickEvent(Number(tab.id), 'message_display');
+      const tabId = Number(tab.id);
+      const messageDetails = await browser.messageDisplay.getDisplayedMessage(tabId);
+      if (messageDetails) {
+        const msgId = messageDetails.id;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const acctEmail = (await browser.accounts.get(messageDetails.folder!.accountId)).name;
+        await handleClickEvent(tabId, acctEmail, msgId);
+      }
     });
   }
 
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index c4034f65ed7..6ab8a0011f6 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -11,7 +11,6 @@ import { Dict } from './core/common.js';
 import { Env, WebMailName, WebMailVersion } from './browser/env.js';
 import { KeyStore } from './platform/store/key-store.js';
 import { PassphraseStore } from './platform/store/passphrase-store.js';
-import { ThunderbirdMessageDetails } from '../../chrome/elements/compose-modules/compose-types.js';
 
 type Host = {
   gmail: string;
@@ -63,10 +62,10 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, messageDetails?: ThunderbirdMessageDetails | undefined): boolean => {
+  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
-      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, { ...messageDetails }));
+      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId));
       composeWin.attr('data-order', alreadyOpenedCount + 1);
       this.S.cached('body').append(composeWin); // xss-safe-factory
       return true;
diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts
index 98ea3d55536..0fb8419af14 100644
--- a/extension/js/common/xss-safe-factory.ts
+++ b/extension/js/common/xss-safe-factory.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { Dict, Str, Url, UrlParam, UrlParams } from './core/common.js';
+import { Dict, Str, Url, UrlParams } from './core/common.js';
 import { Attachment } from './core/attachment.js';
 import { Browser } from './browser/browser.js';
 import { BrowserMsg } from './browser/browser-msg.js';
@@ -96,12 +96,12 @@ export class XssSafeFactory {
     return this.extUrl(`img/${relPath}`);
   };
 
-  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, messageDetails?: Dict<UrlParam>) => {
+  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, thunderbirdMsgId?: number) => {
     return this.frameSrc(this.extUrl('chrome/elements/compose.htm'), {
       frameId: this.newId(),
       draftId,
       useFullScreenSecureCompose,
-      externalMessageDetails: JSON.stringify(messageDetails),
+      thunderbirdMsgId,
     });
   };
 
@@ -199,8 +199,8 @@ export class XssSafeFactory {
     await Ui.modal.iframe(this.srcAddPubkeyDialog(emails, 'gmail'), undefined, 'dialog-add-pubkey');
   };
 
-  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, messageDetails?: Dict<UrlParam>) => {
-    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, messageDetails);
+  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number) => {
+    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, thunderbirdMsgId);
     return Ui.e('div', {
       class: openInFullScreen ? 'secure_compose_window active full_window' : 'secure_compose_window',
       html: this.iframe(srcComposeMsg, [], { scrolling: 'no' }),
diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts
index 6e8b2823746..49c1d4aab90 100644
--- a/tooling/build-types-and-manifests.ts
+++ b/tooling/build-types-and-manifests.ts
@@ -62,7 +62,7 @@ addManifest(
     (manifest.browser_action as browser._manifest.ActionManifest).default_title = 'FlowCrypt';
     manifest.name = 'FlowCrypt Encryption for Thunderbird';
     manifest.description = 'Simple end-to-end encryption to secure email and attachments on Thunderbird';
-    manifest.permissions = [...(manifestV3.permissions ?? []), 'compose', 'messagesRead'];
+    manifest.permissions = [...(manifestV3.permissions ?? []), 'compose', 'messagesRead', 'accountsRead'];
     manifest.compose_action = {
       default_title: 'Secure Compose', // eslint-disable-line @typescript-eslint/naming-convention
       default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention

From 8f071d2ff9a7d9ebbffd82955a81f1ed65c8fc58 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 26 Jun 2024 18:50:54 +0800
Subject: [PATCH 38/78] wip: refine Gmail.threadIdGet

---
 extension/chrome/settings/inbox/inbox.ts         |  4 +---
 .../api/email-provider/gmail/gmail-parser.ts     | 16 +++++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 44d52a60106..f02aa198359 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -159,9 +159,7 @@ export class InboxView extends View {
         if (messageId) {
           const gmail = new Gmail(this.acctEmail);
           const gmailRes = await gmail.threadIdGet(messageId);
-          if (gmailRes?.messages) {
-            threadId = gmailRes.messages[0].threadId;
-          }
+          threadId = gmailRes.messages[0].threadId;
         }
       }
     }
diff --git a/extension/js/common/api/email-provider/gmail/gmail-parser.ts b/extension/js/common/api/email-provider/gmail/gmail-parser.ts
index 3acc19f7ddd..d3b6e27a6f9 100644
--- a/extension/js/common/api/email-provider/gmail/gmail-parser.ts
+++ b/extension/js/common/api/email-provider/gmail/gmail-parser.ts
@@ -65,15 +65,13 @@ export namespace GmailRes {
     nextPageToken: string;
     resultSizeEstimate: number;
   };
-  export type GmailThreadIdQuery =
-    | {
-        messages?: {
-          id: string;
-          threadId: string;
-        }[];
-        resultSizeEstimate: number;
-      }
-    | undefined;
+  export type GmailThreadIdQuery = {
+    messages: {
+      id: string;
+      threadId: string;
+    }[];
+    resultSizeEstimate: number;
+  };
   export type GmailDraftCreate = { id: string };
   export type GmailDraftDelete = {}; // eslint-disable-line @typescript-eslint/ban-types
   export type GmailDraftUpdate = {}; // eslint-disable-line @typescript-eslint/ban-types

From 14f17fc1dce086b49f581657cf2c72b963f42b12 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 26 Jun 2024 20:38:30 +0800
Subject: [PATCH 39/78] wip: better quote email rendering and recognizing reply
 and forward response

---
 .../compose-modules/compose-quote-module.ts   | 14 +++---
 .../elements/compose-modules/compose-types.ts |  8 ----
 extension/chrome/elements/compose.ts          | 48 +++++++++++--------
 extension/chrome/settings/inbox/inbox.ts      | 15 +++++-
 extension/js/common/browser/browser-msg.ts    | 10 ++--
 extension/js/common/inject.ts                 |  4 +-
 extension/js/common/xss-safe-factory.ts       |  7 +--
 7 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index 1fb97548c96..a76f037929f 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -85,13 +85,6 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
-  public convertLineBreakToBr = (text: string, shouldQuote: boolean) => {
-    return text
-      .split('\n')
-      .map(line => `<br>${shouldQuote ? '&gt; ' : ''}${line}`.trim())
-      .join('');
-  };
-
   private getAndDecryptMessage = async (msgId: string, method: 'reply' | 'forward'): Promise<MessageToReplyOrForward | undefined> => {
     try {
       const { raw } = await this.view.emailProvider.msgGet(msgId, 'raw', progress => this.setQuoteLoaderProgress(progress));
@@ -210,6 +203,13 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
+  private convertLineBreakToBr = (text: string, shouldQuote: boolean) => {
+    return text
+      .split('\n')
+      .map(line => `<br>${shouldQuote ? '&gt; ' : ''}${line}`.trim())
+      .join('');
+  };
+
   private generateHtmlPreviousMsgQuote = (method: 'reply' | 'forward') => {
     if (!this.messageToReplyOrForward?.text || !this.messageToReplyOrForward.headers.date) {
       return;
diff --git a/extension/chrome/elements/compose-modules/compose-types.ts b/extension/chrome/elements/compose-modules/compose-types.ts
index 53d378b4c4f..f1b299968d7 100644
--- a/extension/chrome/elements/compose-modules/compose-types.ts
+++ b/extension/chrome/elements/compose-modules/compose-types.ts
@@ -45,14 +45,6 @@ export type MessageToReplyOrForwardHeaders = {
   cc?: string[];
 };
 
-export interface ThunderbirdMessageDetails {
-  subject: string;
-  to?: string[];
-  cc?: string[];
-  bcc?: string[];
-  plainTextBody?: string;
-}
-
 export type MessageToReplyOrForward = {
   headers: MessageToReplyOrForwardHeaders;
   isOnlySigned?: boolean;
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 00b72ed2c5b..7a34f72f661 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -7,7 +7,7 @@ import { Assert } from '../../js/common/assert.js';
 import { Bm, BrowserMsg } from '../../js/common/browser/browser-msg.js';
 import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js';
 import { Ui } from '../../js/common/browser/ui.js';
-import { PromiseCancellation, Str, Url } from '../../js/common/core/common.js';
+import { PromiseCancellation, Url } from '../../js/common/core/common.js';
 import { View } from '../../js/common/view.js';
 import { XssSafeFactory } from '../../js/common/xss-safe-factory.js';
 import { opgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
@@ -32,7 +32,6 @@ import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { AccountServer } from '../../js/common/api/account-server.js';
 import { ComposeReplyBtnPopoverModule, ReplyOption } from './compose-modules/compose-reply-btn-popover-module.js';
 import { Lang } from '../../js/common/lang.js';
-import { ThunderbirdMessageDetails } from './compose-modules/compose-types.js';
 
 export class ComposeView extends View {
   public readonly acctEmail: string;
@@ -46,6 +45,7 @@ export class ComposeView extends View {
   public readonly isReplyBox: boolean;
   public readonly replyMsgId: string;
   public readonly replyPubkeyMismatch: boolean;
+  public readonly composeMethod: 'reply' | 'forward' | undefined;
   public readonly thunderbirdMsgId: number;
   public replyOption?: ReplyOption;
   public fesUrl?: string;
@@ -155,6 +155,7 @@ export class ComposeView extends View {
       'replyOption',
       'useFullScreenSecureCompose',
       'thunderbirdMsgId',
+      'composeMethod',
     ]);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId');
@@ -170,6 +171,7 @@ export class ComposeView extends View {
     this.replyMsgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'replyMsgId') || '';
     this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
     this.thunderbirdMsgId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'thunderbirdMsgId'));
+    this.composeMethod = (Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'composeMethod') as 'reply') || 'forward';
     this.isReplyBox = !!this.replyMsgId;
     this.emailProvider = new Gmail(this.acctEmail);
     this.acctServer = new AccountServer(this.acctEmail);
@@ -274,32 +276,38 @@ export class ComposeView extends View {
   private preParseEmailRecipientsIfNeeded = async () => {
     if (Catch.isThunderbirdMail() && this.thunderbirdMsgId) {
       const thunderbirdMimeMsg = await browser.messages.getFull(this.thunderbirdMsgId);
+      const from = thunderbirdMimeMsg.headers?.from[0];
+      const to = thunderbirdMimeMsg.headers?.to || [];
+      const cc = thunderbirdMimeMsg.headers?.cc || [];
+      const bcc = thunderbirdMimeMsg.headers?.bcc || [];
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const subject = thunderbirdMimeMsg.headers!.subject[0];
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const date = thunderbirdMimeMsg.headers!.date[0];
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const msgId = thunderbirdMimeMsg.headers?.['message-id'][0] || '';
       let plainTextBody;
       if (thunderbirdMimeMsg?.parts?.[0]?.contentType === 'multipart/alternative') {
         plainTextBody = thunderbirdMimeMsg?.parts?.[0]?.parts?.[0].body;
       }
-      const messageDetails = {
-        to: thunderbirdMimeMsg.headers?.to,
-        cc: thunderbirdMimeMsg.headers?.cc,
-        bcc: thunderbirdMimeMsg.headers?.bcc,
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        subject: thunderbirdMimeMsg.headers!.subject[0],
-        plainTextBody,
-      } as ThunderbirdMessageDetails;
-      if (messageDetails.plainTextBody) {
-        // todo: add date details since we are now parsing the MIME message
-        const quotedPlainTextBody = this.quoteModule.convertLineBreakToBr(messageDetails.plainTextBody, true);
-        const rtl = messageDetails.plainTextBody.match(new RegExp('[' + Str.rtlChars + ']'));
-        const dirAttr = `dir="${rtl ? 'rtl' : 'ltr'}"`;
-        this.quoteModule.tripleDotSanitizedHtmlContent = {
-          quote: `<blockquote ${dirAttr} class="height-0">${quotedPlainTextBody}</blockquote>`, // xss-safe-value
-          footer: undefined, // no footer needed already pre-rendered by addSignatureToInput
+      if (plainTextBody && this.composeMethod) {
+        this.quoteModule.messageToReplyOrForward = {
+          text: plainTextBody,
+          headers: {
+            to,
+            from,
+            subject,
+            date,
+            references: msgId,
+            'message-id': msgId,
+          },
+          decryptedFiles: [], // todo : needs to update - https://github.com/FlowCrypt/flowcrypt-browser/issues/5668
         };
+        await this.quoteModule.addTripleDotQuoteExpandFooterAndQuoteBtn(msgId, this.composeMethod);
         this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
         this.S.cached('password_or_pubkey').height(1);
       }
-      this.S.cached('input_subject').val(messageDetails.subject);
-      const { to = [], cc = [], bcc = [] } = messageDetails;
+      this.S.cached('input_subject').val(subject);
       if (to.length || cc.length || bcc.length) {
         this.S.cached('input_addresses_container_outer').removeClass('invisible');
         this.S.cached('recipients_placeholder').hide();
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index f02aa198359..b71ffd9edc4 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -38,6 +38,7 @@ export class InboxView extends View {
   public readonly debug: boolean;
   public readonly useFullScreenSecureCompose: boolean;
   public readonly thunderbirdMsgId: number | undefined;
+  public readonly composeMethod: 'reply' | 'forward' | undefined;
   public readonly S: SelCache;
   public readonly gmail: Gmail;
 
@@ -51,13 +52,23 @@ export class InboxView extends View {
 
   public constructor() {
     super();
-    const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug', 'useFullScreenSecureCompose', 'thunderbirdMsgId']);
+    const uncheckedUrlParams = Url.parse([
+      'acctEmail',
+      'labelId',
+      'threadId',
+      'showOriginal',
+      'debug',
+      'useFullScreenSecureCompose',
+      'composeMethod',
+      'thunderbirdMsgId',
+    ]);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.labelId = uncheckedUrlParams.labelId ? String(uncheckedUrlParams.labelId) : 'INBOX';
     this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId');
     this.showOriginal = uncheckedUrlParams.showOriginal === true;
     this.debug = uncheckedUrlParams.debug === true;
     this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
+    this.composeMethod = (Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'composeMethod') as 'reply') || 'forward';
     this.thunderbirdMsgId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'thunderbirdMsgId'));
     this.S = Ui.buildJquerySels({ threads: '.threads', thread: '.thread', body: 'body' });
     this.gmail = new Gmail(this.acctEmail);
@@ -145,7 +156,7 @@ export class InboxView extends View {
 
   private preRenderSecureComposeInFullScreen = () => {
     if (this.useFullScreenSecureCompose && this.thunderbirdMsgId) {
-      this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId);
+      this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, this.composeMethod);
     }
   };
 
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 7913905c52a..6bfd3f72585 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -452,11 +452,14 @@ export class BrowserMsg {
   }
 
   public static thunderbirdSecureComposeHandler() {
-    const handleClickEvent = async (tabId: number, acctEmail: string, thunderbirdMsgId: number) => {
+    const handleClickEvent = async (tabId: number, acctEmail: string, thunderbirdMsgId: number, composeMethod?: browser.compose._ComposeDetailsType) => {
       const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
       const useFullScreenSecureCompose = (await browser.windows.getCurrent()).type === 'messageCompose';
+      composeMethod = composeMethod === 'reply' || composeMethod === 'forward' ? composeMethod : undefined;
       if (accountEmails) {
-        await BgUtils.openExtensionTab(Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, useFullScreenSecureCompose, thunderbirdMsgId }));
+        await BgUtils.openExtensionTab(
+          Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, useFullScreenSecureCompose, thunderbirdMsgId, composeMethod })
+        );
         await browser.tabs.remove(tabId);
       } else {
         await BgUtils.openExtensionTab(Url.create('/chrome/settings/initial.htm', {}));
@@ -464,10 +467,11 @@ export class BrowserMsg {
     };
     browser.composeAction.onClicked.addListener(async tab => {
       const messageDetails = await browser.compose.getComposeDetails(Number(tab.id));
+      const composeMethod = messageDetails.type;
       const msgId = Number(messageDetails.relatedMessageId);
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const acctEmail = Str.parseEmail(messageDetails.from as string).email!;
-      await handleClickEvent(Number(tab.id), acctEmail, msgId);
+      await handleClickEvent(Number(tab.id), acctEmail, msgId, composeMethod);
     });
     browser.messageDisplayAction.onClicked.addListener(async tab => {
       const tabId = Number(tab.id);
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index 6ab8a0011f6..672a93e8d70 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -62,10 +62,10 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number): boolean => {
+  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, composeMethod?: string): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
-      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId));
+      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId, composeMethod));
       composeWin.attr('data-order', alreadyOpenedCount + 1);
       this.S.cached('body').append(composeWin); // xss-safe-factory
       return true;
diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts
index 0fb8419af14..6c4169956db 100644
--- a/extension/js/common/xss-safe-factory.ts
+++ b/extension/js/common/xss-safe-factory.ts
@@ -96,12 +96,13 @@ export class XssSafeFactory {
     return this.extUrl(`img/${relPath}`);
   };
 
-  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, thunderbirdMsgId?: number) => {
+  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, thunderbirdMsgId?: number, composeMethod?: string) => {
     return this.frameSrc(this.extUrl('chrome/elements/compose.htm'), {
       frameId: this.newId(),
       draftId,
       useFullScreenSecureCompose,
       thunderbirdMsgId,
+      composeMethod,
     });
   };
 
@@ -199,8 +200,8 @@ export class XssSafeFactory {
     await Ui.modal.iframe(this.srcAddPubkeyDialog(emails, 'gmail'), undefined, 'dialog-add-pubkey');
   };
 
-  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number) => {
-    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, thunderbirdMsgId);
+  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, composeMethod?: string) => {
+    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, thunderbirdMsgId, composeMethod);
     return Ui.e('div', {
       class: openInFullScreen ? 'secure_compose_window active full_window' : 'secure_compose_window',
       html: this.iframe(srcComposeMsg, [], { scrolling: 'no' }),

From d0dd04e6859efdca85703ce1a37dabc598c860bf Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 18:00:35 +0800
Subject: [PATCH 40/78] Pr review: remove eslint exception flags

---
 extension/chrome/elements/compose.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 7a34f72f661..22706621e1e 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -277,14 +277,11 @@ export class ComposeView extends View {
     if (Catch.isThunderbirdMail() && this.thunderbirdMsgId) {
       const thunderbirdMimeMsg = await browser.messages.getFull(this.thunderbirdMsgId);
       const from = thunderbirdMimeMsg.headers?.from[0];
+      const date = thunderbirdMimeMsg.headers?.date[0];
       const to = thunderbirdMimeMsg.headers?.to || [];
       const cc = thunderbirdMimeMsg.headers?.cc || [];
       const bcc = thunderbirdMimeMsg.headers?.bcc || [];
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const subject = thunderbirdMimeMsg.headers!.subject[0];
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const date = thunderbirdMimeMsg.headers!.date[0];
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const subject = thunderbirdMimeMsg.headers?.subject[0] || '';
       const msgId = thunderbirdMimeMsg.headers?.['message-id'][0] || '';
       let plainTextBody;
       if (thunderbirdMimeMsg?.parts?.[0]?.contentType === 'multipart/alternative') {

From 71be459d4dfc486d629af0b72fbf8a898b26b471 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 18:05:18 +0800
Subject: [PATCH 41/78] Pr review: destructure getFull() return values

---
 extension/chrome/elements/compose.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 22706621e1e..03226e9d906 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -275,17 +275,17 @@ export class ComposeView extends View {
 
   private preParseEmailRecipientsIfNeeded = async () => {
     if (Catch.isThunderbirdMail() && this.thunderbirdMsgId) {
-      const thunderbirdMimeMsg = await browser.messages.getFull(this.thunderbirdMsgId);
-      const from = thunderbirdMimeMsg.headers?.from[0];
-      const date = thunderbirdMimeMsg.headers?.date[0];
-      const to = thunderbirdMimeMsg.headers?.to || [];
-      const cc = thunderbirdMimeMsg.headers?.cc || [];
-      const bcc = thunderbirdMimeMsg.headers?.bcc || [];
-      const subject = thunderbirdMimeMsg.headers?.subject[0] || '';
-      const msgId = thunderbirdMimeMsg.headers?.['message-id'][0] || '';
+      const { headers, parts } = await browser.messages.getFull(this.thunderbirdMsgId);
+      const from = headers?.from[0];
+      const date = headers?.date[0];
+      const to = headers?.to || [];
+      const cc = headers?.cc || [];
+      const bcc = headers?.bcc || [];
+      const subject = headers?.subject[0] || '';
+      const msgId = headers?.['message-id'][0] || '';
       let plainTextBody;
-      if (thunderbirdMimeMsg?.parts?.[0]?.contentType === 'multipart/alternative') {
-        plainTextBody = thunderbirdMimeMsg?.parts?.[0]?.parts?.[0].body;
+      if (parts?.[0]?.contentType === 'multipart/alternative') {
+        plainTextBody = parts?.[0]?.parts?.[0].body;
       }
       if (plainTextBody && this.composeMethod) {
         this.quoteModule.messageToReplyOrForward = {

From 20da4936bdd7f7a23f0f465cb2d56e025f8f7bf4 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 18:11:58 +0800
Subject: [PATCH 42/78] Pr review: Set a better place to run
 parseThreadIdFromHeaderMessageId()

---
 extension/chrome/settings/inbox/inbox.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index b71ffd9edc4..5210c3d3744 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -97,13 +97,15 @@ export class InboxView extends View {
         $('body').text('Not supported for ' + emailProvider);
       } else {
         await this.inboxMenuModule.render();
-        const parsedThreadId = await this.parseThreadIdFromHeaderMessageId();
         if (this.threadId) {
           await this.inboxActiveThreadModule.render(this.threadId);
-        } else if (parsedThreadId) {
-          await this.inboxActiveThreadModule.render(parsedThreadId);
         } else {
-          await this.inboxListThreadsModule.render(this.labelId);
+          const parsedThreadId = await this.parseThreadIdFromHeaderMessageId();
+          if (parsedThreadId) {
+            await this.inboxActiveThreadModule.render(parsedThreadId);
+          } else {
+            await this.inboxListThreadsModule.render(this.labelId);
+          }
         }
       }
     } catch (e) {

From f7b4da361408683716e9448ca5370cea203133d3 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 18:16:52 +0800
Subject: [PATCH 43/78] Pr review: cleanup

---
 extension/chrome/settings/inbox/inbox.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 5210c3d3744..46e728583e2 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -164,11 +164,10 @@ export class InboxView extends View {
 
   private parseThreadIdFromHeaderMessageId = async () => {
     let threadId;
-    const tbMsgId = Number(this.thunderbirdMsgId);
-    if (Catch.isThunderbirdMail() && tbMsgId && !this.useFullScreenSecureCompose) {
-      const thunderbirdFullMsg = await browser.messages.getFull(tbMsgId);
-      if (thunderbirdFullMsg.headers) {
-        const messageId = thunderbirdFullMsg.headers['message-id'][0];
+    if (Catch.isThunderbirdMail() && this.thunderbirdMsgId && !this.useFullScreenSecureCompose) {
+      const { headers } = await browser.messages.getFull(this.thunderbirdMsgId);
+      if (headers) {
+        const messageId = headers['message-id'][0];
         if (messageId) {
           const gmail = new Gmail(this.acctEmail);
           const gmailRes = await gmail.threadIdGet(messageId);

From 908b47c3b93352df040745ce3a0f117955f04f7b Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 18:19:03 +0800
Subject: [PATCH 44/78] Pr review: Remove unused css

---
 extension/css/cryptup.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extension/css/cryptup.css b/extension/css/cryptup.css
index 0696a3b680a..f9c42658e0e 100644
--- a/extension/css/cryptup.css
+++ b/extension/css/cryptup.css
@@ -1,8 +1,4 @@
 /* © 2016-2018 FlowCrypt Limited. Limitations apply. Contact human@flowcrypt.com */
-.height-0 {
-  height: 0;
-}
-
 .flex {
   display: flex;
 }

From c5996ab4eb8a2e7f3f33f10859e16ba272fe94ee Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 18:20:39 +0800
Subject: [PATCH 45/78] Pr review: Remove  Gmail  re-iniatialization

---
 extension/chrome/settings/inbox/inbox.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 46e728583e2..b13770d1607 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -169,8 +169,7 @@ export class InboxView extends View {
       if (headers) {
         const messageId = headers['message-id'][0];
         if (messageId) {
-          const gmail = new Gmail(this.acctEmail);
-          const gmailRes = await gmail.threadIdGet(messageId);
+          const gmailRes = await this.gmail.threadIdGet(messageId);
           threadId = gmailRes.messages[0].threadId;
         }
       }

From cb0a31ed0d8f48f25e5cc3b3e250dec22018f7eb Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 18:29:37 +0800
Subject: [PATCH 46/78] Pr review: use already exist Gmail functions and
 typings for email search

---
 extension/chrome/settings/inbox/inbox.ts                   | 7 +++++--
 .../js/common/api/email-provider/gmail/gmail-parser.ts     | 7 -------
 extension/js/common/api/email-provider/gmail/gmail.ts      | 4 ----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index b13770d1607..c9dae7b5a9b 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -169,8 +169,11 @@ export class InboxView extends View {
       if (headers) {
         const messageId = headers['message-id'][0];
         if (messageId) {
-          const gmailRes = await this.gmail.threadIdGet(messageId);
-          threadId = gmailRes.messages[0].threadId;
+          const query = `rfc822msgid:${messageId}`;
+          const gmailRes = await this.gmail.msgList(query);
+          if (gmailRes.messages) {
+            threadId = gmailRes.messages[0].threadId;
+          }
         }
       }
     }
diff --git a/extension/js/common/api/email-provider/gmail/gmail-parser.ts b/extension/js/common/api/email-provider/gmail/gmail-parser.ts
index d3b6e27a6f9..5e44edddf81 100644
--- a/extension/js/common/api/email-provider/gmail/gmail-parser.ts
+++ b/extension/js/common/api/email-provider/gmail/gmail-parser.ts
@@ -65,13 +65,6 @@ export namespace GmailRes {
     nextPageToken: string;
     resultSizeEstimate: number;
   };
-  export type GmailThreadIdQuery = {
-    messages: {
-      id: string;
-      threadId: string;
-    }[];
-    resultSizeEstimate: number;
-  };
   export type GmailDraftCreate = { id: string };
   export type GmailDraftDelete = {}; // eslint-disable-line @typescript-eslint/ban-types
   export type GmailDraftUpdate = {}; // eslint-disable-line @typescript-eslint/ban-types
diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts
index c7518a3a17e..42b1b4929b9 100644
--- a/extension/js/common/api/email-provider/gmail/gmail.ts
+++ b/extension/js/common/api/email-provider/gmail/gmail.ts
@@ -33,10 +33,6 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface {
     }
   };
 
-  public threadIdGet = async (messageId: string): Promise<GmailRes.GmailThreadIdQuery> => {
-    return await Google.gmailCall<GmailRes.GmailThreadIdQuery>(this.acctEmail, 'messages', { method: 'GET', data: { q: `rfc822msgid:${messageId}` } });
-  };
-
   public threadGet = async (threadId: string, format?: GmailResponseFormat, progressCb?: ProgressCb): Promise<GmailRes.GmailThread> => {
     return await Google.gmailCall<GmailRes.GmailThread>(this.acctEmail, `threads/${threadId}`, { method: 'GET', data: { format } }, { download: progressCb });
   };

From f07a05868459e8679435d6303aad406f2a1dd137 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 20:05:20 +0800
Subject: [PATCH 47/78] wip: cleanup

---
 extension/chrome/elements/compose.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 03226e9d906..5487d2b010b 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -276,8 +276,6 @@ export class ComposeView extends View {
   private preParseEmailRecipientsIfNeeded = async () => {
     if (Catch.isThunderbirdMail() && this.thunderbirdMsgId) {
       const { headers, parts } = await browser.messages.getFull(this.thunderbirdMsgId);
-      const from = headers?.from[0];
-      const date = headers?.date[0];
       const to = headers?.to || [];
       const cc = headers?.cc || [];
       const bcc = headers?.bcc || [];
@@ -292,9 +290,9 @@ export class ComposeView extends View {
           text: plainTextBody,
           headers: {
             to,
-            from,
             subject,
-            date,
+            from: headers?.from[0],
+            date: headers?.date[0],
             references: msgId,
             'message-id': msgId,
           },

From 0dd777aa206f8a38264d1f3a9f89bf55d793d198 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 20:39:36 +0800
Subject: [PATCH 48/78] wip: cleanup

---
 extension/chrome/popups/select_account.ts | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/extension/chrome/popups/select_account.ts b/extension/chrome/popups/select_account.ts
index e0f086ccaf5..55e53d9c8c7 100644
--- a/extension/chrome/popups/select_account.ts
+++ b/extension/chrome/popups/select_account.ts
@@ -14,16 +14,12 @@ import { GlobalStore } from '../../js/common/platform/store/global-store.js';
 
 View.run(
   class SelectAcctPopupView extends View {
-    private readonly tabId?: number;
-    private readonly pageUrlParams?: string;
     private readonly action: 'inbox' | 'settings';
 
     public constructor() {
       super();
-      const uncheckedUrlParams = Url.parse(['action', 'tabId', 'pageUrlParams']);
+      const uncheckedUrlParams = Url.parse(['action']);
       this.action = Assert.urlParamRequire.oneof(uncheckedUrlParams, 'action', ['inbox', 'settings']);
-      this.tabId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'tabId'));
-      this.pageUrlParams = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'pageUrlParams');
     }
 
     public render = async () => {
@@ -60,18 +56,13 @@ View.run(
     };
 
     private actionChooseAcctHandler = async (clickedElement: HTMLElement) => {
-      const acctEmail = $(clickedElement).attr('email') || '';
       if (this.action === 'inbox') {
-        await Browser.openExtensionTab(Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, pageUrlParams: this.pageUrlParams }));
+        await Browser.openSettingsPage('inbox/inbox.htm', $(clickedElement).attr('email'));
       } else {
-        await Browser.openSettingsPage('index.htm', acctEmail);
+        await Browser.openSettingsPage('index.htm', $(clickedElement).attr('email'));
       }
       await Time.sleep(100);
-      if (this.tabId) {
-        await browser.tabs.remove(this.tabId);
-      } else {
-        window.close();
-      }
+      window.close();
     };
 
     private actionRedirectToAddAcctPageHandler = async () => {

From 3c5e2d3b329ef81c053bc7aac61c9810b8fc178d Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Fri, 28 Jun 2024 20:42:00 +0800
Subject: [PATCH 49/78] wip: cleanup

---
 extension/chrome/popups/default.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/extension/chrome/popups/default.ts b/extension/chrome/popups/default.ts
index 63bf23e7138..11114122a61 100644
--- a/extension/chrome/popups/default.ts
+++ b/extension/chrome/popups/default.ts
@@ -9,17 +9,11 @@ import { Time } from '../../js/common/browser/time.js';
 import { View } from '../../js/common/view.js';
 import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { GlobalStore } from '../../js/common/platform/store/global-store.js';
-import { Url } from '../../js/common/core/common.js';
-import { Assert } from '../../js/common/assert.js';
 
 View.run(
   class DefaultPopupView extends View {
-    private readonly tabId?: number;
-
     public constructor() {
       super();
-      const uncheckedUrlParams = Url.parse(['tabId']);
-      this.tabId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'tabId'));
     }
 
     public render = async () => {
@@ -71,7 +65,7 @@ View.run(
           if (activeAcctEmail) {
             await this.redirectToInitSetup(activeAcctEmail);
           } else {
-            window.location.href = Url.create('select_account.htm', { action: 'settings' });
+            window.location.href = 'select_account.htm?action=settings';
           }
         })
       );
@@ -83,7 +77,7 @@ View.run(
             await Time.sleep(100);
             window.close();
           } else {
-            window.location.href = Url.create('select_account.htm', { action: 'inbox', tabId: this.tabId });
+            window.location.href = 'select_account.htm?action=inbox';
           }
         })
       );

From f27ad6736b0e18c6b031eb132d5e4174081670ac Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Sat, 29 Jun 2024 10:58:04 +0800
Subject: [PATCH 50/78] wip: improvement

---
 extension/js/common/browser/browser-msg.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 6bfd3f72585..d874038a06a 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -453,10 +453,10 @@ export class BrowserMsg {
 
   public static thunderbirdSecureComposeHandler() {
     const handleClickEvent = async (tabId: number, acctEmail: string, thunderbirdMsgId: number, composeMethod?: browser.compose._ComposeDetailsType) => {
-      const accountEmails = (await GlobalStore.get(['account_emails'])).account_emails;
+      const accountEmails = await GlobalStore.acctEmailsGet();
       const useFullScreenSecureCompose = (await browser.windows.getCurrent()).type === 'messageCompose';
       composeMethod = composeMethod === 'reply' || composeMethod === 'forward' ? composeMethod : undefined;
-      if (accountEmails) {
+      if (accountEmails.length !== 0) {
         await BgUtils.openExtensionTab(
           Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, useFullScreenSecureCompose, thunderbirdMsgId, composeMethod })
         );

From ad9c8ba5998d43f288591c1280303dd62f5ca2a1 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Sat, 29 Jun 2024 11:10:01 +0800
Subject: [PATCH 51/78] wip: long blockquote fix thunderbird

---
 .../chrome/elements/compose-modules/compose-quote-module.ts   | 3 ++-
 extension/css/cryptup.css                                     | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index a76f037929f..de6bd67f6c1 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -224,7 +224,8 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     if (method === 'reply') {
       const header = `<div ${dirAttr}>On ${dateStr}, ${from ?? ''} wrote:</div>`;
       const sanitizedQuote = Xss.htmlSanitize(header + escapedText);
-      return `<blockquote ${dirAttr}>${sanitizedQuote}</blockquote>`;
+      const thunderbirdClass = Catch.isThunderbirdMail() ? 'class="height-0"' : '';
+      return `<blockquote ${thunderbirdClass} ${dirAttr}>${sanitizedQuote}</blockquote>`;
     } else {
       const header =
         `<div ${dirAttr}>` +
diff --git a/extension/css/cryptup.css b/extension/css/cryptup.css
index f9c42658e0e..7ed07ddc8a1 100644
--- a/extension/css/cryptup.css
+++ b/extension/css/cryptup.css
@@ -1,4 +1,8 @@
 /* © 2016-2018 FlowCrypt Limited. Limitations apply. Contact human@flowcrypt.com */
+.height-0 {
+  height: 0 !important;
+}
+
 .flex {
   display: flex;
 }

From 9b5e5218a323da26f992f4f1679b366e9ee833e9 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Sat, 29 Jun 2024 13:04:42 +0800
Subject: [PATCH 52/78] wip: sanitize html body if plain text body not found

---
 extension/chrome/elements/compose.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 5487d2b010b..3c60bfd1262 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -32,6 +32,7 @@ import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { AccountServer } from '../../js/common/api/account-server.js';
 import { ComposeReplyBtnPopoverModule, ReplyOption } from './compose-modules/compose-reply-btn-popover-module.js';
 import { Lang } from '../../js/common/lang.js';
+import { Xss } from '../../js/common/platform/xss.js';
 
 export class ComposeView extends View {
   public readonly acctEmail: string;
@@ -283,7 +284,13 @@ export class ComposeView extends View {
       const msgId = headers?.['message-id'][0] || '';
       let plainTextBody;
       if (parts?.[0]?.contentType === 'multipart/alternative') {
-        plainTextBody = parts?.[0]?.parts?.[0].body;
+        if (parts?.[0].parts?.[0].contentType === 'text/plain') {
+          plainTextBody = parts?.[0]?.parts?.[0].body;
+        } else {
+          // no plain text body found so HTML should be sanitized
+          const sanitizedHtmlBody = Xss.htmlSanitizeAndStripAllTags(parts?.[0]?.parts?.[0].body || '<br>', '');
+          plainTextBody = sanitizedHtmlBody;
+        }
       }
       if (plainTextBody && this.composeMethod) {
         this.quoteModule.messageToReplyOrForward = {

From 48c89cd58cbab845017bf87ffc5bc4ec13d8f2c7 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Sat, 29 Jun 2024 13:30:12 +0800
Subject: [PATCH 53/78] wip: ensure messageToReplyOrForward.headers.from is not
 in "mailbox" as specified in RFC 5322

---
 .../chrome/elements/compose-modules/compose-quote-module.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index de6bd67f6c1..63381f8796d 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -215,7 +215,7 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
       return;
     }
     const text = this.messageToReplyOrForward.text;
-    const from = this.messageToReplyOrForward.headers.from;
+    const from = Str.parseEmail(this.messageToReplyOrForward.headers.from || '').email;
     const date = new Date(String(this.messageToReplyOrForward.headers.date));
     const dateStr = Str.fromDate(date).replace(' ', ' at ');
     const rtl = text.match(new RegExp('[' + Str.rtlChars + ']'));

From 53de3d1dd7f653a6bc5eb54af0a007e7fc74d5c8 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 3 Jul 2024 18:02:59 +0800
Subject: [PATCH 54/78] Pr review: minor fixes

---
 extension/js/service_worker/background.ts | 4 +++-
 tooling/build-types-and-manifests.ts      | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/js/service_worker/background.ts b/extension/js/service_worker/background.ts
index fadcc742744..6e430c6ad68 100644
--- a/extension/js/service_worker/background.ts
+++ b/extension/js/service_worker/background.ts
@@ -69,5 +69,7 @@ console.info('background.js service worker starting');
   injectFcIntoWebmail();
 
   // Thunderbird event handlers
-  BrowserMsg.thunderbirdSecureComposeHandler();
+  if (Catch.isThunderbirdMail()) {
+    BrowserMsg.thunderbirdSecureComposeHandler();
+  }
 })().catch(Catch.reportErr);
diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts
index 565172af9b7..9fb4c03d0d0 100644
--- a/tooling/build-types-and-manifests.ts
+++ b/tooling/build-types-and-manifests.ts
@@ -72,7 +72,6 @@ addManifest(
       default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention
     };
     (manifest.browser_specific_settings as browser._manifest.FirefoxSpecificProperties).strict_min_version = '102.0';
-    delete manifest.background;
     manifest.background = {
       type: 'module',
       scripts: ['/js/service_worker/background.js'],

From fa17dc612e78635acf1d6b818f5e8579f18823eb Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Mon, 8 Jul 2024 11:47:14 +0800
Subject: [PATCH 55/78] Pr review: fix secure compose not opening for new
 message

---
 extension/chrome/elements/compose.ts     | 2 +-
 extension/chrome/settings/inbox/inbox.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 3c60bfd1262..83592787e78 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -275,7 +275,7 @@ export class ComposeView extends View {
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
 
   private preParseEmailRecipientsIfNeeded = async () => {
-    if (Catch.isThunderbirdMail() && this.thunderbirdMsgId) {
+    if (Catch.isThunderbirdMail() && this.thunderbirdMsgId && this.thunderbirdMsgId !== 0) {
       const { headers, parts } = await browser.messages.getFull(this.thunderbirdMsgId);
       const to = headers?.to || [];
       const cc = headers?.cc || [];
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 2ebeeae43e2..64e86fd1e39 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -158,7 +158,7 @@ export class InboxView extends View {
   };
 
   private preRenderSecureComposeInFullScreen = () => {
-    if (this.useFullScreenSecureCompose && this.thunderbirdMsgId) {
+    if (this.useFullScreenSecureCompose && this.thunderbirdMsgId === 0) {
       this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, this.composeMethod);
     }
   };

From a880280981045aaf23e78dcc04df364be36134a0 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Mon, 8 Jul 2024 13:20:12 +0800
Subject: [PATCH 56/78] Pr review: fix secure compose not appearing

---
 extension/chrome/settings/inbox/inbox.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 64e86fd1e39..b55b62e75e7 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -158,7 +158,7 @@ export class InboxView extends View {
   };
 
   private preRenderSecureComposeInFullScreen = () => {
-    if (this.useFullScreenSecureCompose && this.thunderbirdMsgId === 0) {
+    if (this.useFullScreenSecureCompose && this.composeMethod) {
       this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, this.composeMethod);
     }
   };

From 3242bab47e13817dbd96efa86b8ce8d155e67924 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Mon, 8 Jul 2024 13:20:58 +0800
Subject: [PATCH 57/78] wip: add detection for HTML only MIME email

---
 extension/chrome/elements/compose.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 83592787e78..1f71635e1f4 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -283,14 +283,16 @@ export class ComposeView extends View {
       const subject = headers?.subject[0] || '';
       const msgId = headers?.['message-id'][0] || '';
       let plainTextBody;
+      // todo - mime type parsing should be done here extensively - https://github.com/FlowCrypt/flowcrypt-browser/issues/5787
       if (parts?.[0]?.contentType === 'multipart/alternative') {
         if (parts?.[0].parts?.[0].contentType === 'text/plain') {
           plainTextBody = parts?.[0]?.parts?.[0].body;
         } else {
           // no plain text body found so HTML should be sanitized
-          const sanitizedHtmlBody = Xss.htmlSanitizeAndStripAllTags(parts?.[0]?.parts?.[0].body || '<br>', '');
-          plainTextBody = sanitizedHtmlBody;
+          plainTextBody = Xss.htmlSanitizeAndStripAllTags(parts?.[0]?.parts?.[0].body || '<br>', '');
         }
+      } else if (parts?.length === 1 && parts?.[0].contentType === 'text/html') {
+        plainTextBody = Xss.htmlSanitizeAndStripAllTags(parts?.[0]?.body || '<br>', '');
       }
       if (plainTextBody && this.composeMethod) {
         this.quoteModule.messageToReplyOrForward = {

From 76f6593778d8a469978fb7bc89ffd7d720b57d00 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 10 Jul 2024 15:38:57 +0800
Subject: [PATCH 58/78] Pr review: reuse compose.replyOption

---
 extension/chrome/elements/compose.ts     | 8 +++-----
 extension/chrome/settings/inbox/inbox.ts | 3 ++-
 extension/js/common/inject.ts            | 4 ++--
 extension/js/common/xss-safe-factory.ts  | 8 ++++----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 1f71635e1f4..d149dd3fbd8 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -46,7 +46,6 @@ export class ComposeView extends View {
   public readonly isReplyBox: boolean;
   public readonly replyMsgId: string;
   public readonly replyPubkeyMismatch: boolean;
-  public readonly composeMethod: 'reply' | 'forward' | undefined;
   public readonly thunderbirdMsgId: number;
   public replyOption?: ReplyOption;
   public fesUrl?: string;
@@ -156,7 +155,6 @@ export class ComposeView extends View {
       'replyOption',
       'useFullScreenSecureCompose',
       'thunderbirdMsgId',
-      'composeMethod',
     ]);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId');
@@ -172,7 +170,6 @@ export class ComposeView extends View {
     this.replyMsgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'replyMsgId') || '';
     this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
     this.thunderbirdMsgId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'thunderbirdMsgId'));
-    this.composeMethod = (Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'composeMethod') as 'reply') || 'forward';
     this.isReplyBox = !!this.replyMsgId;
     this.emailProvider = new Gmail(this.acctEmail);
     this.acctServer = new AccountServer(this.acctEmail);
@@ -282,6 +279,7 @@ export class ComposeView extends View {
       const bcc = headers?.bcc || [];
       const subject = headers?.subject[0] || '';
       const msgId = headers?.['message-id'][0] || '';
+      const replyOption = this.replyOption === 'a_reply' ? 'reply' : 'forward';
       let plainTextBody;
       // todo - mime type parsing should be done here extensively - https://github.com/FlowCrypt/flowcrypt-browser/issues/5787
       if (parts?.[0]?.contentType === 'multipart/alternative') {
@@ -294,7 +292,7 @@ export class ComposeView extends View {
       } else if (parts?.length === 1 && parts?.[0].contentType === 'text/html') {
         plainTextBody = Xss.htmlSanitizeAndStripAllTags(parts?.[0]?.body || '<br>', '');
       }
-      if (plainTextBody && this.composeMethod) {
+      if (plainTextBody) {
         this.quoteModule.messageToReplyOrForward = {
           text: plainTextBody,
           headers: {
@@ -307,7 +305,7 @@ export class ComposeView extends View {
           },
           decryptedFiles: [], // todo : needs to update - https://github.com/FlowCrypt/flowcrypt-browser/issues/5668
         };
-        await this.quoteModule.addTripleDotQuoteExpandFooterAndQuoteBtn(msgId, this.composeMethod);
+        await this.quoteModule.addTripleDotQuoteExpandFooterAndQuoteBtn(msgId, replyOption);
         this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
         this.S.cached('password_or_pubkey').height(1);
       }
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index b55b62e75e7..a74c4c4f5e0 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -159,7 +159,8 @@ export class InboxView extends View {
 
   private preRenderSecureComposeInFullScreen = () => {
     if (this.useFullScreenSecureCompose && this.composeMethod) {
-      this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, this.composeMethod);
+      const replyOption = this.composeMethod === 'reply' ? 'a_reply' : 'forward';
+      this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, replyOption);
     }
   };
 
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index 672a93e8d70..ec49530c20a 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -62,10 +62,10 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, composeMethod?: string): boolean => {
+  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, replyOption?: string): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
-      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId, composeMethod));
+      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId, replyOption));
       composeWin.attr('data-order', alreadyOpenedCount + 1);
       this.S.cached('body').append(composeWin); // xss-safe-factory
       return true;
diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts
index 6c4169956db..9528e227dfa 100644
--- a/extension/js/common/xss-safe-factory.ts
+++ b/extension/js/common/xss-safe-factory.ts
@@ -96,13 +96,13 @@ export class XssSafeFactory {
     return this.extUrl(`img/${relPath}`);
   };
 
-  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, thunderbirdMsgId?: number, composeMethod?: string) => {
+  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, thunderbirdMsgId?: number, replyOption?: string) => {
     return this.frameSrc(this.extUrl('chrome/elements/compose.htm'), {
       frameId: this.newId(),
       draftId,
       useFullScreenSecureCompose,
       thunderbirdMsgId,
-      composeMethod,
+      replyOption,
     });
   };
 
@@ -200,8 +200,8 @@ export class XssSafeFactory {
     await Ui.modal.iframe(this.srcAddPubkeyDialog(emails, 'gmail'), undefined, 'dialog-add-pubkey');
   };
 
-  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, composeMethod?: string) => {
-    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, thunderbirdMsgId, composeMethod);
+  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, replyOption?: string) => {
+    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, thunderbirdMsgId, replyOption);
     return Ui.e('div', {
       class: openInFullScreen ? 'secure_compose_window active full_window' : 'secure_compose_window',
       html: this.iframe(srcComposeMsg, [], { scrolling: 'no' }),

From 93467cc665e33170927897165a360fe69322f436 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 10 Jul 2024 16:47:58 +0800
Subject: [PATCH 59/78] Pr review: fix recipient pre-filled data for
 non-forwarded reply

---
 extension/chrome/elements/compose.ts | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index d149dd3fbd8..bdb6e720fe1 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -277,9 +277,9 @@ export class ComposeView extends View {
       const to = headers?.to || [];
       const cc = headers?.cc || [];
       const bcc = headers?.bcc || [];
-      const subject = headers?.subject[0] || '';
-      const msgId = headers?.['message-id'][0] || '';
       const replyOption = this.replyOption === 'a_reply' ? 'reply' : 'forward';
+      const subject = `${replyOption === 'reply' ? 'Re:' : 'Fwd:'} ${headers?.subject[0]}` || '';
+      const msgId = headers?.['message-id'][0] || '';
       let plainTextBody;
       // todo - mime type parsing should be done here extensively - https://github.com/FlowCrypt/flowcrypt-browser/issues/5787
       if (parts?.[0]?.contentType === 'multipart/alternative') {
@@ -310,17 +310,19 @@ export class ComposeView extends View {
         this.S.cached('password_or_pubkey').height(1);
       }
       this.S.cached('input_subject').val(subject);
-      if (to.length || cc.length || bcc.length) {
-        this.S.cached('input_addresses_container_outer').removeClass('invisible');
-        this.S.cached('recipients_placeholder').hide();
-        this.S.cached('input_to').val(to.join(','));
-        this.S.cached('input_container_cc').val(cc.join(','));
-        this.S.cached('input_container_bcc').val(cc.join(','));
-      }
-      const preParsedRecipient = ['#input-container-to', '#input-container-cc', '#input-container-bcc'];
-      for (const inputContainer of preParsedRecipient) {
-        if (String($(inputContainer).find('input').val()).trim().length > 0) {
-          await this.recipientsModule.parseRenderRecipients($(inputContainer).find('input'));
+      if (replyOption === 'reply') {
+        if (to.length || cc.length || bcc.length) {
+          this.S.cached('input_addresses_container_outer').removeClass('invisible');
+          this.S.cached('recipients_placeholder').hide();
+          this.S.cached('input_to').val(to.join(','));
+          this.S.cached('input_container_cc').val(cc.join(','));
+          this.S.cached('input_container_bcc').val(cc.join(','));
+        }
+        const preParsedRecipient = ['#input-container-to', '#input-container-cc', '#input-container-bcc'];
+        for (const inputContainer of preParsedRecipient) {
+          if (String($(inputContainer).find('input').val()).trim().length > 0) {
+            await this.recipientsModule.parseRenderRecipients($(inputContainer).find('input'));
+          }
         }
       }
     }

From 89fe62e9354c37fcf57d8367cd7fc2b82b887836 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 10 Jul 2024 16:57:16 +0800
Subject: [PATCH 60/78] Pr review: use better namespace for Thunderbird API
 typings

---
 extension/chrome/elements/compose.ts       |  2 +-
 extension/chrome/settings/inbox/inbox.ts   |  2 +-
 extension/js/common/browser/browser-msg.ts | 16 ++++++++--------
 tooling/build-types-and-manifests.ts       |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index bdb6e720fe1..64fd74066e4 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -273,7 +273,7 @@ export class ComposeView extends View {
 
   private preParseEmailRecipientsIfNeeded = async () => {
     if (Catch.isThunderbirdMail() && this.thunderbirdMsgId && this.thunderbirdMsgId !== 0) {
-      const { headers, parts } = await browser.messages.getFull(this.thunderbirdMsgId);
+      const { headers, parts } = await messenger.messages.getFull(this.thunderbirdMsgId);
       const to = headers?.to || [];
       const cc = headers?.cc || [];
       const bcc = headers?.bcc || [];
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index a74c4c4f5e0..adb09db950d 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -167,7 +167,7 @@ export class InboxView extends View {
   private parseThreadIdFromHeaderMessageId = async () => {
     let threadId;
     if (Catch.isThunderbirdMail() && this.thunderbirdMsgId && !this.useFullScreenSecureCompose) {
-      const { headers } = await browser.messages.getFull(this.thunderbirdMsgId);
+      const { headers } = await messenger.messages.getFull(this.thunderbirdMsgId);
       if (headers) {
         const messageId = headers['message-id'][0];
         if (messageId) {
diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts
index 537f79a5c46..efa940961bd 100644
--- a/extension/js/common/browser/browser-msg.ts
+++ b/extension/js/common/browser/browser-msg.ts
@@ -455,34 +455,34 @@ export class BrowserMsg {
   }
 
   public static thunderbirdSecureComposeHandler() {
-    const handleClickEvent = async (tabId: number, acctEmail: string, thunderbirdMsgId: number, composeMethod?: browser.compose._ComposeDetailsType) => {
+    const handleClickEvent = async (tabId: number, acctEmail: string, thunderbirdMsgId: number, composeMethod?: messenger.compose._ComposeDetailsType) => {
       const accountEmails = await GlobalStore.acctEmailsGet();
-      const useFullScreenSecureCompose = (await browser.windows.getCurrent()).type === 'messageCompose';
+      const useFullScreenSecureCompose = (await messenger.windows.getCurrent()).type === 'messageCompose';
       composeMethod = composeMethod === 'reply' || composeMethod === 'forward' ? composeMethod : undefined;
       if (accountEmails.length !== 0) {
         await BgUtils.openExtensionTab(
           Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail, useFullScreenSecureCompose, thunderbirdMsgId, composeMethod })
         );
-        await browser.tabs.remove(tabId);
+        await messenger.tabs.remove(tabId);
       } else {
         await BgUtils.openExtensionTab(Url.create('/chrome/settings/initial.htm', {}));
       }
     };
-    browser.composeAction.onClicked.addListener(async tab => {
-      const messageDetails = await browser.compose.getComposeDetails(Number(tab.id));
+    messenger.composeAction.onClicked.addListener(async tab => {
+      const messageDetails = await messenger.compose.getComposeDetails(Number(tab.id));
       const composeMethod = messageDetails.type;
       const msgId = Number(messageDetails.relatedMessageId);
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const acctEmail = Str.parseEmail(messageDetails.from as string).email!;
       await handleClickEvent(Number(tab.id), acctEmail, msgId, composeMethod);
     });
-    browser.messageDisplayAction.onClicked.addListener(async tab => {
+    messenger.messageDisplayAction.onClicked.addListener(async tab => {
       const tabId = Number(tab.id);
-      const messageDetails = await browser.messageDisplay.getDisplayedMessage(tabId);
+      const messageDetails = await messenger.messageDisplay.getDisplayedMessage(tabId);
       if (messageDetails) {
         const msgId = messageDetails.id;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const acctEmail = (await browser.accounts.get(messageDetails.folder!.accountId)).name;
+        const acctEmail = (await messenger.accounts.get(messageDetails.folder!.accountId)).name;
         await handleClickEvent(tabId, acctEmail, msgId);
       }
     });
diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts
index 9fb4c03d0d0..5cdbb41b9c8 100644
--- a/tooling/build-types-and-manifests.ts
+++ b/tooling/build-types-and-manifests.ts
@@ -58,8 +58,8 @@ addManifest('firefox-consumer', manifest => {
 addManifest(
   'thunderbird-consumer',
   manifest => {
-    const manifestV3 = manifest as browser._manifest.WebExtensionManifest;
-    (manifest.browser_action as browser._manifest.ActionManifest).default_title = 'FlowCrypt';
+    const manifestV3 = manifest as messenger._manifest.WebExtensionManifest;
+    (manifest.browser_action as messenger._manifest.ActionManifest).default_title = 'FlowCrypt';
     manifest.name = 'FlowCrypt Encryption for Thunderbird';
     manifest.description = 'Simple end-to-end encryption to secure email and attachments on Thunderbird';
     manifest.permissions = [...(manifestV3.permissions ?? []), 'compose', 'messagesRead', 'accountsRead'];
@@ -71,7 +71,7 @@ addManifest(
       default_title: 'Secure Compose', // eslint-disable-line @typescript-eslint/naming-convention
       default_icon: '/img/logo/flowcrypt-logo-64-64.png', // eslint-disable-line @typescript-eslint/naming-convention
     };
-    (manifest.browser_specific_settings as browser._manifest.FirefoxSpecificProperties).strict_min_version = '102.0';
+    (manifest.browser_specific_settings as messenger._manifest.FirefoxSpecificProperties).strict_min_version = '102.0';
     manifest.background = {
       type: 'module',
       scripts: ['/js/service_worker/background.js'],

From ddeabce103b8fa1bc80253ba757edbfdd08d3f5f Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Sun, 14 Jul 2024 14:26:15 +0800
Subject: [PATCH 61/78] Add support to replying on current threadId
 (Thunderbird)

---
 .../compose-modules/compose-render-module.ts  | 28 +++++++++++--------
 extension/chrome/settings/inbox/inbox.ts      | 12 ++++----
 extension/js/common/inject.ts                 |  4 +--
 extension/js/common/platform/catch.ts         |  4 +--
 extension/js/common/xss-safe-factory.ts       |  7 +++--
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
index ed70378a74d..7c0eae05531 100644
--- a/extension/chrome/elements/compose-modules/compose-render-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -174,17 +174,21 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
       Xss.sanitizeRender(repliedBodyEl, Str.escapeTextAsRenderableHtml(this.view.inputModule.extract('text', 'input_text', 'SKIP-ADDONS')));
       this.renderReplySuccessAttachments(attachments, msgId, this.view.sendBtnModule.popover.choices.encrypt);
     }
-    const t = new Date();
-    const time =
-      (t.getHours() !== 12 ? t.getHours() % 12 : 12) +
-      ':' +
-      (t.getMinutes() < 10 ? '0' : '') +
-      t.getMinutes() +
-      (t.getHours() >= 12 ? ' PM ' : ' AM ') +
-      '(0 minutes ago)';
-    this.view.S.cached('reply_msg_successful').find('div.replied_time').text(time);
-    this.view.S.cached('reply_msg_successful').css('display', 'block');
-    this.view.sizeModule.resizeComposeBox();
+    if (this.view.isReplyBox && !this.view.useFullScreenSecureCompose) {
+      const t = new Date();
+      const time =
+        (t.getHours() !== 12 ? t.getHours() % 12 : 12) +
+        ':' +
+        (t.getMinutes() < 10 ? '0' : '') +
+        t.getMinutes() +
+        (t.getHours() >= 12 ? ' PM ' : ' AM ') +
+        '(0 minutes ago)';
+      this.view.S.cached('reply_msg_successful').find('div.replied_time').text(time);
+      this.view.S.cached('reply_msg_successful').css('display', 'block');
+      this.view.sizeModule.resizeComposeBox();
+    } else {
+      this.view.S.cached('body').removeClass('full_window');
+    }
   };
 
   public renderReinsertReplyBox = (msgId: string) => {
@@ -264,7 +268,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
   };
 
   private initComposeBoxStyles = () => {
-    if (this.view.isReplyBox) {
+    if (this.view.isReplyBox && !this.view.useFullScreenSecureCompose) {
       this.view.S.cached('body').addClass('reply_box');
       this.view.S.cached('header').remove();
       this.view.S.cached('subject').remove();
diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index adb09db950d..78482446ab2 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -87,7 +87,8 @@ export class InboxView extends View {
     ({ email_provider: emailProvider, picture: this.picture } = await AcctStore.get(this.acctEmail, ['email_provider', 'picture']));
     this.messageRenderer = await MessageRenderer.newInstance(this.acctEmail, this.gmail, this.relayManager, this.factory, this.debug);
     this.inboxNotificationModule.render();
-    this.preRenderSecureComposeInFullScreen();
+    const parsedThreadId = await this.parseThreadIdFromHeaderMessageId();
+    this.preRenderSecureComposeInFullScreen(parsedThreadId);
     if (Catch.isThunderbirdMail()) {
       $('#container-gmail-banner').hide();
     }
@@ -100,8 +101,7 @@ export class InboxView extends View {
         if (this.threadId) {
           await this.inboxActiveThreadModule.render(this.threadId);
         } else {
-          const parsedThreadId = await this.parseThreadIdFromHeaderMessageId();
-          if (parsedThreadId) {
+          if (parsedThreadId && !this.useFullScreenSecureCompose) {
             await this.inboxActiveThreadModule.render(parsedThreadId);
           } else {
             await this.inboxListThreadsModule.render(this.labelId);
@@ -157,16 +157,16 @@ export class InboxView extends View {
     Xss.sanitizeRender('h1', title);
   };
 
-  private preRenderSecureComposeInFullScreen = () => {
+  private preRenderSecureComposeInFullScreen = (replyMsgId?: string) => {
     if (this.useFullScreenSecureCompose && this.composeMethod) {
       const replyOption = this.composeMethod === 'reply' ? 'a_reply' : 'forward';
-      this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, replyOption);
+      this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, replyOption, replyMsgId);
     }
   };
 
   private parseThreadIdFromHeaderMessageId = async () => {
     let threadId;
-    if (Catch.isThunderbirdMail() && this.thunderbirdMsgId && !this.useFullScreenSecureCompose) {
+    if (Catch.isThunderbirdMail() && this.thunderbirdMsgId) {
       const { headers } = await messenger.messages.getFull(this.thunderbirdMsgId);
       if (headers) {
         const messageId = headers['message-id'][0];
diff --git a/extension/js/common/inject.ts b/extension/js/common/inject.ts
index ec49530c20a..e49d00970bd 100644
--- a/extension/js/common/inject.ts
+++ b/extension/js/common/inject.ts
@@ -62,10 +62,10 @@ export class Injector {
       .append(this.factory.metaStylesheet('webmail') + this.factory.metaNotificationContainer()); // xss-safe-factory
   };
 
-  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, replyOption?: string): boolean => {
+  public openComposeWin = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, replyOption?: string, replyMsgId?: string): boolean => {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
-      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId, replyOption));
+      const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId, replyOption, replyMsgId));
       composeWin.attr('data-order', alreadyOpenedCount + 1);
       this.S.cached('body').append(composeWin); // xss-safe-factory
       return true;
diff --git a/extension/js/common/platform/catch.ts b/extension/js/common/platform/catch.ts
index d7244f6292f..c8fcce9f749 100644
--- a/extension/js/common/platform/catch.ts
+++ b/extension/js/common/platform/catch.ts
@@ -174,9 +174,9 @@ export class Catch {
     return Catch.browser().name === 'firefox';
   }
 
-  public static isThunderbirdMail = () => {
+  public static isThunderbirdMail(): boolean {
     return Catch.browser().name === 'thunderbird';
-  };
+  }
 
   public static environment(url = location.href): string {
     const browserName = Catch.browser().name;
diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts
index 9528e227dfa..8eb5199f6d1 100644
--- a/extension/js/common/xss-safe-factory.ts
+++ b/extension/js/common/xss-safe-factory.ts
@@ -96,13 +96,14 @@ export class XssSafeFactory {
     return this.extUrl(`img/${relPath}`);
   };
 
-  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, thunderbirdMsgId?: number, replyOption?: string) => {
+  public srcComposeMsg = (draftId?: string, useFullScreenSecureCompose?: boolean, thunderbirdMsgId?: number, replyOption?: string, replyMsgId?: string) => {
     return this.frameSrc(this.extUrl('chrome/elements/compose.htm'), {
       frameId: this.newId(),
       draftId,
       useFullScreenSecureCompose,
       thunderbirdMsgId,
       replyOption,
+      replyMsgId,
     });
   };
 
@@ -200,8 +201,8 @@ export class XssSafeFactory {
     await Ui.modal.iframe(this.srcAddPubkeyDialog(emails, 'gmail'), undefined, 'dialog-add-pubkey');
   };
 
-  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, replyOption?: string) => {
-    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, thunderbirdMsgId, replyOption);
+  public embeddedCompose = (draftId?: string, openInFullScreen?: boolean, thunderbirdMsgId?: number, replyOption?: string, replyMsgId?: string) => {
+    const srcComposeMsg = this.srcComposeMsg(draftId, openInFullScreen, thunderbirdMsgId, replyOption, replyMsgId);
     return Ui.e('div', {
       class: openInFullScreen ? 'secure_compose_window active full_window' : 'secure_compose_window',
       html: this.iframe(srcComposeMsg, [], { scrolling: 'no' }),

From 763dda4fe4886873e4dcc94f1a3b811d957f958a Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Wed, 17 Jul 2024 16:40:55 +0800
Subject: [PATCH 62/78] Improve UX for Thunderbird client users

---
 extension/chrome/settings/setup.htm    |  2 +-
 extension/chrome/settings/setup.ts     | 12 +++++++++++-
 extension/js/service_worker/bgutils.ts |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/extension/chrome/settings/setup.htm b/extension/chrome/settings/setup.htm
index dee62ed69e1..8d1fddf2e90 100644
--- a/extension/chrome/settings/setup.htm
+++ b/extension/chrome/settings/setup.htm
@@ -338,7 +338,7 @@ <h1>Set Up FlowCrypt</h1>
 
       <div id="step_4_done">
         <div class="wide line">
-          <a class="button longer green action_send" target="_blank">COMPOSE ENCRYPTED EMAIL</a>
+          <a class="button longer green action_send">COMPOSE ENCRYPTED EMAIL</a>
         </div>
         <div class="wide line">
           <button class="button longer gray action_account_settings" data-test="action-step4done-account-settings">MORE SETTINGS</button>
diff --git a/extension/chrome/settings/setup.ts b/extension/chrome/settings/setup.ts
index 73fb14ffbf6..bfa51ad06ef 100644
--- a/extension/chrome/settings/setup.ts
+++ b/extension/chrome/settings/setup.ts
@@ -34,6 +34,7 @@ import Swal from 'sweetalert2';
 import { BackupUi } from '../../js/common/ui/backup-ui/backup-ui.js';
 import { InMemoryStoreKeys } from '../../js/common/core/const.js';
 import { InMemoryStore } from '../../js/common/platform/store/in-memory-store.js';
+import { BgUtils } from '../../js/service_worker/bgutils.js';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 export interface PassphraseOptions {
@@ -167,7 +168,10 @@ export class SetupView extends View {
       await Ui.modal.info(notification);
     });
     BrowserMsg.listen(this.tabId);
-    $('.action_send').attr('href', Google.webmailUrl(this.acctEmail));
+    $('.action_send').on(
+      'click',
+      this.setHandler(async () => await this.actionComposeEncryptedEmailHandler())
+    );
     $('.action_show_help').on(
       'click',
       this.setHandler(async () => await Settings.renderSubPage(this.acctEmail, this.tabId, '/chrome/settings/modules/help.htm'))
@@ -375,6 +379,12 @@ export class SetupView extends View {
     return true;
   };
 
+  private actionComposeEncryptedEmailHandler = async () => {
+    const inboxUrl = Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: this.acctEmail });
+    const redirectUrl = Catch.isThunderbirdMail() ? inboxUrl : Google.webmailUrl(this.acctEmail);
+    await BgUtils.openExtensionTab(redirectUrl, true);
+  };
+
   /**
    * empty pubkey means key not usable
    */
diff --git a/extension/js/service_worker/bgutils.ts b/extension/js/service_worker/bgutils.ts
index 479c40a5952..bada583943f 100644
--- a/extension/js/service_worker/bgutils.ts
+++ b/extension/js/service_worker/bgutils.ts
@@ -21,9 +21,9 @@ export class BgUtils {
     }
   }
 
-  public static async openExtensionTab(url: string) {
+  public static async openExtensionTab(url: string, openInNewTab = false) {
     const openedTab = await BgUtils.getFcSettingsTabIdIfOpen();
-    if (!openedTab) {
+    if (!openedTab || openInNewTab) {
       await chrome.tabs.create({ url });
     } else {
       await chrome.tabs.update(openedTab, { url, active: true });

From 964df72bc7de3e9f237de65471c301b50a99ef74 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 18 Jul 2024 12:41:37 +0800
Subject: [PATCH 63/78] Remove already performed function

---
 extension/chrome/elements/compose.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 64fd74066e4..be33f649eef 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -305,8 +305,6 @@ export class ComposeView extends View {
           },
           decryptedFiles: [], // todo : needs to update - https://github.com/FlowCrypt/flowcrypt-browser/issues/5668
         };
-        await this.quoteModule.addTripleDotQuoteExpandFooterAndQuoteBtn(msgId, replyOption);
-        this.quoteModule.actionRenderTripleDotContentHandle(this.S.cached('triple_dot')[0]);
         this.S.cached('password_or_pubkey').height(1);
       }
       this.S.cached('input_subject').val(subject);

From 37e243c37be72b1d5c72a195eee24dbc4e57900d Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 18 Jul 2024 15:13:57 +0800
Subject: [PATCH 64/78] Revert changes on compose-render-module.ts

---
 .../elements/compose-modules/compose-render-module.ts       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
index 7c0eae05531..b866ced9566 100644
--- a/extension/chrome/elements/compose-modules/compose-render-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -174,7 +174,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
       Xss.sanitizeRender(repliedBodyEl, Str.escapeTextAsRenderableHtml(this.view.inputModule.extract('text', 'input_text', 'SKIP-ADDONS')));
       this.renderReplySuccessAttachments(attachments, msgId, this.view.sendBtnModule.popover.choices.encrypt);
     }
-    if (this.view.isReplyBox && !this.view.useFullScreenSecureCompose) {
+    if (this.view.isReplyBox) {
       const t = new Date();
       const time =
         (t.getHours() !== 12 ? t.getHours() % 12 : 12) +
@@ -186,8 +186,6 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
       this.view.S.cached('reply_msg_successful').find('div.replied_time').text(time);
       this.view.S.cached('reply_msg_successful').css('display', 'block');
       this.view.sizeModule.resizeComposeBox();
-    } else {
-      this.view.S.cached('body').removeClass('full_window');
     }
   };
 
@@ -268,7 +266,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
   };
 
   private initComposeBoxStyles = () => {
-    if (this.view.isReplyBox && !this.view.useFullScreenSecureCompose) {
+    if (this.view.isReplyBox) {
       this.view.S.cached('body').addClass('reply_box');
       this.view.S.cached('header').remove();
       this.view.S.cached('subject').remove();

From 320620bce8bd047047ca7b952b3a553b4e24cdd7 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 18 Jul 2024 16:14:47 +0800
Subject: [PATCH 65/78] Fix discrepancy between replyMsgId and isReplyBox usage

---
 .../compose-modules/compose-render-module.ts  | 11 ++--
 extension/chrome/elements/compose.ts          | 61 +------------------
 2 files changed, 9 insertions(+), 63 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
index b866ced9566..99a279db5d0 100644
--- a/extension/chrome/elements/compose-modules/compose-render-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -30,7 +30,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
     if (this.view.useFullScreenSecureCompose) {
       $('body').addClass('full_window');
     }
-    if (this.view.isReplyBox) {
+    if (this.view.replyMsgId) {
       this.responseMethod = 'reply';
     }
     await this.view.replyPopoverModule.render(this.view.isReplyBox);
@@ -44,11 +44,11 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
         this.view.draftModule.startDraftTimer();
         this.view.S.cached('triple_dot').remove(); // if it's draft, footer and quote should already be included in the draft
       }
-      if (this.view.isReplyBox) {
+      if (this.view.replyMsgId) {
         await this.view.renderModule.renderReplyMsgComposeTable();
       }
     } else {
-      if (this.view.isReplyBox && this.view.replyParams) {
+      if (this.view.replyMsgId && this.view.replyParams) {
         const recipients: Recipients = {
           to: this.view.replyParams.to,
           cc: this.view.replyParams.cc,
@@ -102,6 +102,9 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
         )?.value;
       }
       this.view.replyParams.subject = `${this.responseMethod === 'reply' ? 'Re' : 'Fwd'}: ${this.view.replyParams.subject}`;
+      if (this.view.useFullScreenSecureCompose) {
+        this.view.S.cached('input_subject').val(this.view.replyParams.subject);
+      }
     }
     if (!this.view.draftModule.wasMsgLoadedFromDraft) {
       // if there is a draft, don't attempt to pull quoted content. It's assumed to be already present in the draft
@@ -333,7 +336,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
     this.view.S.cached('compose_table').css('display', 'table');
     await this.addComposeTableHandlers();
     await this.view.senderModule.renderSendFromIfMoreThanOneAlias();
-    if (this.view.isReplyBox) {
+    if (this.view.replyMsgId) {
       if (this.view.replyParams?.to.length) {
         // Firefox will not always respond to initial automatic $input_text.blur(): recipients may be left unrendered, as standard text, with a trailing comma
         await this.view.recipientsModule.parseRenderRecipients(this.view.S.cached('input_to')); // this will force firefox to render them on load
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index be33f649eef..c1c2384169b 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -32,7 +32,6 @@ import { AcctStore } from '../../js/common/platform/store/acct-store.js';
 import { AccountServer } from '../../js/common/api/account-server.js';
 import { ComposeReplyBtnPopoverModule, ReplyOption } from './compose-modules/compose-reply-btn-popover-module.js';
 import { Lang } from '../../js/common/lang.js';
-import { Xss } from '../../js/common/platform/xss.js';
 
 export class ComposeView extends View {
   public readonly acctEmail: string;
@@ -170,7 +169,7 @@ export class ComposeView extends View {
     this.replyMsgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'replyMsgId') || '';
     this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
     this.thunderbirdMsgId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'thunderbirdMsgId'));
-    this.isReplyBox = !!this.replyMsgId;
+    this.isReplyBox = !!this.replyMsgId && !this.useFullScreenSecureCompose;
     this.emailProvider = new Gmail(this.acctEmail);
     this.acctServer = new AccountServer(this.acctEmail);
   }
@@ -210,8 +209,7 @@ export class ComposeView extends View {
     }
     BrowserMsg.listen(this.tabId);
     await this.renderModule.initComposeBox();
-    await this.preParseEmailRecipientsIfNeeded();
-    if (this.replyOption && this.isReplyBox) {
+    if (this.replyOption) {
       await this.renderModule.activateReplyOption(this.replyOption, true);
     }
     this.senderModule.checkEmailAliases().catch(Catch.reportErr);
@@ -270,61 +268,6 @@ export class ComposeView extends View {
   };
 
   public isCustomerUrlFesUsed = () => Boolean(this.fesUrl);
-
-  private preParseEmailRecipientsIfNeeded = async () => {
-    if (Catch.isThunderbirdMail() && this.thunderbirdMsgId && this.thunderbirdMsgId !== 0) {
-      const { headers, parts } = await messenger.messages.getFull(this.thunderbirdMsgId);
-      const to = headers?.to || [];
-      const cc = headers?.cc || [];
-      const bcc = headers?.bcc || [];
-      const replyOption = this.replyOption === 'a_reply' ? 'reply' : 'forward';
-      const subject = `${replyOption === 'reply' ? 'Re:' : 'Fwd:'} ${headers?.subject[0]}` || '';
-      const msgId = headers?.['message-id'][0] || '';
-      let plainTextBody;
-      // todo - mime type parsing should be done here extensively - https://github.com/FlowCrypt/flowcrypt-browser/issues/5787
-      if (parts?.[0]?.contentType === 'multipart/alternative') {
-        if (parts?.[0].parts?.[0].contentType === 'text/plain') {
-          plainTextBody = parts?.[0]?.parts?.[0].body;
-        } else {
-          // no plain text body found so HTML should be sanitized
-          plainTextBody = Xss.htmlSanitizeAndStripAllTags(parts?.[0]?.parts?.[0].body || '<br>', '');
-        }
-      } else if (parts?.length === 1 && parts?.[0].contentType === 'text/html') {
-        plainTextBody = Xss.htmlSanitizeAndStripAllTags(parts?.[0]?.body || '<br>', '');
-      }
-      if (plainTextBody) {
-        this.quoteModule.messageToReplyOrForward = {
-          text: plainTextBody,
-          headers: {
-            to,
-            subject,
-            from: headers?.from[0],
-            date: headers?.date[0],
-            references: msgId,
-            'message-id': msgId,
-          },
-          decryptedFiles: [], // todo : needs to update - https://github.com/FlowCrypt/flowcrypt-browser/issues/5668
-        };
-        this.S.cached('password_or_pubkey').height(1);
-      }
-      this.S.cached('input_subject').val(subject);
-      if (replyOption === 'reply') {
-        if (to.length || cc.length || bcc.length) {
-          this.S.cached('input_addresses_container_outer').removeClass('invisible');
-          this.S.cached('recipients_placeholder').hide();
-          this.S.cached('input_to').val(to.join(','));
-          this.S.cached('input_container_cc').val(cc.join(','));
-          this.S.cached('input_container_bcc').val(cc.join(','));
-        }
-        const preParsedRecipient = ['#input-container-to', '#input-container-cc', '#input-container-bcc'];
-        for (const inputContainer of preParsedRecipient) {
-          if (String($(inputContainer).find('input').val()).trim().length > 0) {
-            await this.recipientsModule.parseRenderRecipients($(inputContainer).find('input'));
-          }
-        }
-      }
-    }
-  };
 }
 
 View.run(ComposeView);

From 415f1264e9a7155801fcc9cc19b9e70b9270f1fe Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 18 Jul 2024 16:44:17 +0800
Subject: [PATCH 66/78] Refactor close_compose_window, fixing the event handler
 that was not bound successfully

---
 .../compose-modules/compose-render-module.ts     | 16 ++++++----------
 extension/chrome/elements/compose.ts             |  5 +++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
index 99a279db5d0..bdfd9d3c803 100644
--- a/extension/chrome/elements/compose-modules/compose-render-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -268,6 +268,12 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
     await this.renderReplyMsgComposeTable();
   };
 
+  public actionCloseHandler = async () => {
+    if (!this.view.sendBtnModule.isSendMessageInProgres() || (await Ui.modal.confirm(Lang.compose.abortSending))) {
+      this.view.renderModule.closeMsg();
+    }
+  };
+
   private initComposeBoxStyles = () => {
     if (this.view.isReplyBox) {
       this.view.S.cached('body').addClass('reply_box');
@@ -342,10 +348,6 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
         await this.view.recipientsModule.parseRenderRecipients(this.view.S.cached('input_to')); // this will force firefox to render them on load
       }
     } else {
-      $('.close_compose_window').on(
-        'click',
-        this.view.setHandler(() => this.actionCloseHandler(), this.view.errModule.handle(`close compose window`))
-      );
       this.view.S.cached('title').on('click', () => {
         if (this.view.sizeModule.composeWindowIsMinimized) {
           $('.minimize_compose_window').trigger('click');
@@ -408,12 +410,6 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
     }
   };
 
-  private actionCloseHandler = async () => {
-    if (!this.view.sendBtnModule.isSendMessageInProgres() || (await Ui.modal.confirm(Lang.compose.abortSending))) {
-      this.view.renderModule.closeMsg();
-    }
-  };
-
   private onRecipientsClickHandler = () => {
     if (!this.view.S.cached('input_to').is(':focus')) {
       this.view.errModule.debug(
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index c1c2384169b..430bf9e3499 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -110,6 +110,7 @@ export class ComposeView extends View {
     toggle_send_options: '#toggle_send_options',
     toggle_reply_options: '#toggle_reply_options',
     icon_pubkey: '.icon.action_include_pubkey',
+    close_compose_window: '.close_compose_window',
     icon_help: '.action_feedback',
     icon_popout: '.popout img',
     triple_dot: '.action_show_prev_msg',
@@ -233,6 +234,10 @@ export class ComposeView extends View {
     });
     this.S.cached('body').on('focusin', setActiveWindow);
     this.S.cached('body').on('click', setActiveWindow);
+    this.S.cached('close_compose_window').on(
+      'click',
+      this.setHandler(async () => await this.renderModule.actionCloseHandler(), this.errModule.handle(`close compose window`))
+    );
     this.S.cached('icon_help').on(
       'click',
       this.setHandler(async () => await this.renderModule.openSettingsWithDialog('help'), this.errModule.handle(`help dialog`))

From 8a9bd6cae299be2b93e9379ae1f0a6f4d9bef4f4 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 18 Jul 2024 16:44:47 +0800
Subject: [PATCH 67/78] Fix passphrase_dialog not appearing

---
 .../chrome/elements/compose-modules/compose-quote-module.ts   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index 63381f8796d..344dd6e901b 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -17,6 +17,7 @@ import { ViewModule } from '../../../js/common/view-module.js';
 import { ComposeView } from '../compose.js';
 import { MessageToReplyOrForward } from './compose-types.js';
 import { KeyStore } from '../../../js/common/platform/store/key-store.js';
+import { Time } from '../../../js/common/browser/time.js';
 
 export class ComposeQuoteModule extends ViewModule<ComposeView> {
   public tripleDotSanitizedHtmlContent: { quote: string | undefined; footer: string | undefined } | undefined;
@@ -186,6 +187,9 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     if (decryptRes.success) {
       return decryptRes.content.toUtfStr();
     } else if (decryptRes.error && decryptRes.error.type === DecryptErrTypes.needPassphrase) {
+      if (this.view.useFullScreenSecureCompose) {
+        await Time.sleep(2000);
+      }
       BrowserMsg.send.passphraseDialog(this.view.parentTabId, {
         type: 'quote',
         longids: decryptRes.longids.needPassphrase,

From 4ee981c066b269b7252bd3c3066cac59ffcdcaab Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Thu, 18 Jul 2024 16:59:19 +0800
Subject: [PATCH 68/78] Use appropriate detection for Time.sleep()

---
 .../chrome/elements/compose-modules/compose-quote-module.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index 344dd6e901b..77ca4934baf 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -187,8 +187,8 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     if (decryptRes.success) {
       return decryptRes.content.toUtfStr();
     } else if (decryptRes.error && decryptRes.error.type === DecryptErrTypes.needPassphrase) {
-      if (this.view.useFullScreenSecureCompose) {
-        await Time.sleep(2000);
+      if (Catch.isThunderbirdMail() && this.view.useFullScreenSecureCompose) {
+        await Time.sleep(2300);
       }
       BrowserMsg.send.passphraseDialog(this.view.parentTabId, {
         type: 'quote',

From cf63c3ede7461c2520298eb89b8178d1d96f3164 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 13:18:00 +0800
Subject: [PATCH 69/78] Add better check and comment for UI bug fix

---
 .../chrome/elements/compose-modules/compose-quote-module.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index 77ca4934baf..43a901e1c3c 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -228,7 +228,7 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     if (method === 'reply') {
       const header = `<div ${dirAttr}>On ${dateStr}, ${from ?? ''} wrote:</div>`;
       const sanitizedQuote = Xss.htmlSanitize(header + escapedText);
-      const thunderbirdClass = Catch.isThunderbirdMail() ? 'class="height-0"' : '';
+      const thunderbirdClass = this.view.useFullScreenSecureCompose ? 'class="height-0"' : ''; // fix long quoted email UI issue happens in fullscreen
       return `<blockquote ${thunderbirdClass} ${dirAttr}>${sanitizedQuote}</blockquote>`;
     } else {
       const header =

From 8b5f8d8e0a08f6cd5ac3a903a4cbda742f352fd8 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 13:41:30 +0800
Subject: [PATCH 70/78] Fix popoverItems undefined when using FullScreen secure
 compose

---
 .../compose-modules/compose-reply-btn-popover-module.ts       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose-modules/compose-reply-btn-popover-module.ts b/extension/chrome/elements/compose-modules/compose-reply-btn-popover-module.ts
index ea96cd48128..64cc4bafbf7 100644
--- a/extension/chrome/elements/compose-modules/compose-reply-btn-popover-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-reply-btn-popover-module.ts
@@ -45,7 +45,9 @@ export class ComposeReplyBtnPopoverModule extends ViewModule<ComposeView> {
   };
 
   public changeOptionImage = (option: ReplyOption) => {
-    $('.reply-options-icon').attr('src', this.popoverItems[option].iconPath);
+    if (!this.view.useFullScreenSecureCompose) {
+      $('.reply-options-icon').attr('src', this.popoverItems[option].iconPath);
+    }
   };
 
   private didOptionClick = async (option: ReplyOption) => {

From 9806c94ae368bdf6fb72afb6d2c5b4b01368af89 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 16:40:19 +0800
Subject: [PATCH 71/78] Revert changes

---
 .../compose-modules/compose-quote-module.ts    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index 43a901e1c3c..3f28b1fe484 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -38,15 +38,6 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     this.actionRenderTripleDotContentHandle(this.view.S.cached('triple_dot')[0]);
   };
 
-  public actionRenderTripleDotContentHandle = (el: HTMLElement) => {
-    $(el).remove();
-    const inputEl = this.view.S.cached('input_text');
-    Xss.sanitizeAppend(inputEl, this.getTripleDotSanitizedFormattedHtmlContent());
-    this.view.draftModule.setLastDraftBody(inputEl.html());
-    this.tripleDotSanitizedHtmlContent = undefined;
-    this.view.sizeModule.resizeComposeBox();
-  };
-
   public addTripleDotQuoteExpandFooterAndQuoteBtn = async (msgId: string, method: 'reply' | 'forward', forceReload = false) => {
     if (!this.messageToReplyOrForward || forceReload) {
       this.view.S.cached('triple_dot').addClass('progress');
@@ -86,6 +77,15 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
+  private actionRenderTripleDotContentHandle = (el: HTMLElement) => {
+    $(el).remove();
+    const inputEl = this.view.S.cached('input_text');
+    Xss.sanitizeAppend(inputEl, this.getTripleDotSanitizedFormattedHtmlContent());
+    this.view.draftModule.setLastDraftBody(inputEl.html());
+    this.tripleDotSanitizedHtmlContent = undefined;
+    this.view.sizeModule.resizeComposeBox();
+  };
+
   private getAndDecryptMessage = async (msgId: string, method: 'reply' | 'forward'): Promise<MessageToReplyOrForward | undefined> => {
     try {
       const { raw } = await this.view.emailProvider.msgGet(msgId, 'raw', progress => this.setQuoteLoaderProgress(progress));

From 35a07cfd623988b20503cb47bc2225bc296cb8f0 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 16:41:53 +0800
Subject: [PATCH 72/78] Fix duplicate ComposeBox initialization for non-reply
 email (new secure compose)

---
 extension/chrome/elements/compose.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 430bf9e3499..d1dab3f5d51 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -210,7 +210,7 @@ export class ComposeView extends View {
     }
     BrowserMsg.listen(this.tabId);
     await this.renderModule.initComposeBox();
-    if (this.replyOption) {
+    if (this.replyOption && this.replyMsgId) {
       await this.renderModule.activateReplyOption(this.replyOption, true);
     }
     this.senderModule.checkEmailAliases().catch(Catch.reportErr);

From a3210e545ee0d4abba5b996d86ede0fbd04f5002 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 16:44:47 +0800
Subject: [PATCH 73/78] Add back CSS UI fixes

---
 .../chrome/elements/compose-modules/compose-render-module.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
index bdfd9d3c803..f0ebcf891a9 100644
--- a/extension/chrome/elements/compose-modules/compose-render-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -28,7 +28,8 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
 
   public initComposeBox = async () => {
     if (this.view.useFullScreenSecureCompose) {
-      $('body').addClass('full_window');
+      this.view.S.cached('body').addClass('full_window');
+      this.view.S.cached('password_or_pubkey').height(1); // fix UI issue in fullscreen
     }
     if (this.view.replyMsgId) {
       this.responseMethod = 'reply';

From 4e58b0e8d240fc02463722c2e1fa07895cb8bcb7 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 17:20:50 +0800
Subject: [PATCH 74/78] Fix quoted email for  email to follow forwarded email
 format

---
 extension/chrome/settings/inbox/inbox.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts
index 78482446ab2..0a4af698973 100644
--- a/extension/chrome/settings/inbox/inbox.ts
+++ b/extension/chrome/settings/inbox/inbox.ts
@@ -159,7 +159,7 @@ export class InboxView extends View {
 
   private preRenderSecureComposeInFullScreen = (replyMsgId?: string) => {
     if (this.useFullScreenSecureCompose && this.composeMethod) {
-      const replyOption = this.composeMethod === 'reply' ? 'a_reply' : 'forward';
+      const replyOption = this.composeMethod === 'reply' ? 'a_reply' : 'a_forward';
       this.injector.openComposeWin(undefined, true, this.thunderbirdMsgId, replyOption, replyMsgId);
     }
   };

From 794659a8a12e8d544fda97e4aae727f7dff53e79 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 17:38:27 +0800
Subject: [PATCH 75/78] wip: cleanup

---
 .../chrome/elements/compose-modules/compose-draft-module.ts    | 2 +-
 extension/chrome/elements/compose.ts                           | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts
index a44e453de73..bc2ba73e173 100644
--- a/extension/chrome/elements/compose-modules/compose-draft-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts
@@ -40,7 +40,7 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
     super(composer);
     // Only start draft timer when draft id is not set.
     // When draft id is set, draft timer will start only when draft is decrypted successfully
-    if (!this.view.disableDraftSaving && !this.view.draftId && !this.view.thunderbirdMsgId) {
+    if (!this.view.disableDraftSaving && !this.view.draftId) {
       this.startDraftTimer();
     }
   }
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index d1dab3f5d51..6acb2dc2451 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -45,7 +45,6 @@ export class ComposeView extends View {
   public readonly isReplyBox: boolean;
   public readonly replyMsgId: string;
   public readonly replyPubkeyMismatch: boolean;
-  public readonly thunderbirdMsgId: number;
   public replyOption?: ReplyOption;
   public fesUrl?: string;
   public skipClickPrompt: boolean;
@@ -154,7 +153,6 @@ export class ComposeView extends View {
       'replyPubkeyMismatch',
       'replyOption',
       'useFullScreenSecureCompose',
-      'thunderbirdMsgId',
     ]);
     this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail');
     this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId');
@@ -169,7 +167,6 @@ export class ComposeView extends View {
     this.draftId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'draftId') || '';
     this.replyMsgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'replyMsgId') || '';
     this.useFullScreenSecureCompose = uncheckedUrlParams.useFullScreenSecureCompose === true;
-    this.thunderbirdMsgId = Number(Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'thunderbirdMsgId'));
     this.isReplyBox = !!this.replyMsgId && !this.useFullScreenSecureCompose;
     this.emailProvider = new Gmail(this.acctEmail);
     this.acctServer = new AccountServer(this.acctEmail);

From 3a61d4c21e5e7fb13a3a86df70aba90b07aaa042 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 17:39:01 +0800
Subject: [PATCH 76/78] Revert changes

---
 .../compose-modules/compose-quote-module.ts    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
index 3f28b1fe484..f80b6a4fb3b 100644
--- a/extension/chrome/elements/compose-modules/compose-quote-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -77,15 +77,6 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
-  private actionRenderTripleDotContentHandle = (el: HTMLElement) => {
-    $(el).remove();
-    const inputEl = this.view.S.cached('input_text');
-    Xss.sanitizeAppend(inputEl, this.getTripleDotSanitizedFormattedHtmlContent());
-    this.view.draftModule.setLastDraftBody(inputEl.html());
-    this.tripleDotSanitizedHtmlContent = undefined;
-    this.view.sizeModule.resizeComposeBox();
-  };
-
   private getAndDecryptMessage = async (msgId: string, method: 'reply' | 'forward'): Promise<MessageToReplyOrForward | undefined> => {
     try {
       const { raw } = await this.view.emailProvider.msgGet(msgId, 'raw', progress => this.setQuoteLoaderProgress(progress));
@@ -244,6 +235,15 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
     }
   };
 
+  private actionRenderTripleDotContentHandle = (el: HTMLElement) => {
+    $(el).remove();
+    const inputEl = this.view.S.cached('input_text');
+    Xss.sanitizeAppend(inputEl, this.getTripleDotSanitizedFormattedHtmlContent());
+    this.view.draftModule.setLastDraftBody(inputEl.html());
+    this.tripleDotSanitizedHtmlContent = undefined;
+    this.view.sizeModule.resizeComposeBox();
+  };
+
   private setQuoteLoaderProgress = (percentOrString: string | number | undefined): void => {
     if (percentOrString) {
       this.view.S.cached('triple_dot')

From bd6a950e865e2d73fc8048b29db3c2e7ea033536 Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 17:43:46 +0800
Subject: [PATCH 77/78] Revert changes

---
 .../compose-modules/compose-render-module.ts  | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
index f0ebcf891a9..cdc2c0e445e 100644
--- a/extension/chrome/elements/compose-modules/compose-render-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -178,19 +178,17 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
       Xss.sanitizeRender(repliedBodyEl, Str.escapeTextAsRenderableHtml(this.view.inputModule.extract('text', 'input_text', 'SKIP-ADDONS')));
       this.renderReplySuccessAttachments(attachments, msgId, this.view.sendBtnModule.popover.choices.encrypt);
     }
-    if (this.view.isReplyBox) {
-      const t = new Date();
-      const time =
-        (t.getHours() !== 12 ? t.getHours() % 12 : 12) +
-        ':' +
-        (t.getMinutes() < 10 ? '0' : '') +
-        t.getMinutes() +
-        (t.getHours() >= 12 ? ' PM ' : ' AM ') +
-        '(0 minutes ago)';
-      this.view.S.cached('reply_msg_successful').find('div.replied_time').text(time);
-      this.view.S.cached('reply_msg_successful').css('display', 'block');
-      this.view.sizeModule.resizeComposeBox();
-    }
+    const t = new Date();
+    const time =
+      (t.getHours() !== 12 ? t.getHours() % 12 : 12) +
+      ':' +
+      (t.getMinutes() < 10 ? '0' : '') +
+      t.getMinutes() +
+      (t.getHours() >= 12 ? ' PM ' : ' AM ') +
+      '(0 minutes ago)';
+    this.view.S.cached('reply_msg_successful').find('div.replied_time').text(time);
+    this.view.S.cached('reply_msg_successful').css('display', 'block');
+    this.view.sizeModule.resizeComposeBox();
   };
 
   public renderReinsertReplyBox = (msgId: string) => {

From aa3344d939f4057748eb68af2da4a30fe0fec89f Mon Sep 17 00:00:00 2001
From: martgil <mart.robles.it@gmail.com>
Date: Tue, 23 Jul 2024 17:46:35 +0800
Subject: [PATCH 78/78] cleanup

---
 extension/chrome/elements/compose.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts
index 6acb2dc2451..560dc815746 100644
--- a/extension/chrome/elements/compose.ts
+++ b/extension/chrome/elements/compose.ts
@@ -121,8 +121,6 @@ export class ComposeView extends View {
     recipients: 'span.recipients',
     contacts: '#contacts',
     input_addresses_container_outer: '#input_addresses_container',
-    input_container_cc: '#input-container-cc input',
-    input_container_bcc: '#input-container-bcc input',
     recipient_left_label: '.recipient-left-label',
     input_container_from: '#input-container-from',
     input_addresses_container_inner: '#input_addresses_container > div:first',
