diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3ca13a012a..c7f65a0a4c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
diff --git a/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/46.json b/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/46.json
new file mode 100644
index 0000000000..6c2646c441
--- /dev/null
+++ b/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/46.json
@@ -0,0 +1,1275 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 46,
+    "identityHash": "6bf4da204f47555b619b66c37ca5e392",
+    "entities": [
+      {
+        "tableName": "accounts_aliases",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `email` TEXT NOT NULL, `account_type` TEXT NOT NULL, `send_as_email` TEXT DEFAULT NULL, `display_name` TEXT DEFAULT NULL, `reply_to_address` TEXT DEFAULT NULL, `signature` TEXT DEFAULT NULL, `is_primary` INTEGER DEFAULT NULL, `is_default` INTEGER DEFAULT NULL, `treat_as_alias` INTEGER DEFAULT NULL, `verification_status` TEXT DEFAULT NULL, FOREIGN KEY(`email`, `account_type`) REFERENCES `accounts`(`email`, `account_type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountType",
+            "columnName": "account_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sendAsEmail",
+            "columnName": "send_as_email",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "display_name",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "replyToAddress",
+            "columnName": "reply_to_address",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "is_primary",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "is_default",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "treatAsAlias",
+            "columnName": "treat_as_alias",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "verificationStatus",
+            "columnName": "verification_status",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "email_account_type_send_as_email_in_accounts_aliases",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "account_type",
+              "send_as_email"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `email_account_type_send_as_email_in_accounts_aliases` ON `${TABLE_NAME}` (`email`, `account_type`, `send_as_email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "accounts",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email",
+              "account_type"
+            ],
+            "referencedColumns": [
+              "email",
+              "account_type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "accounts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `email` TEXT NOT NULL, `account_type` TEXT NOT NULL, `display_name` TEXT DEFAULT NULL, `given_name` TEXT DEFAULT NULL, `family_name` TEXT DEFAULT NULL, `photo_url` TEXT DEFAULT NULL, `is_enabled` INTEGER DEFAULT 1, `is_active` INTEGER DEFAULT 0, `username` TEXT NOT NULL, `password` TEXT NOT NULL, `imap_server` TEXT NOT NULL, `imap_port` INTEGER DEFAULT 143, `imap_use_ssl_tls` INTEGER DEFAULT 0, `imap_use_starttls` INTEGER DEFAULT 0, `imap_auth_mechanisms` TEXT, `smtp_server` TEXT NOT NULL, `smtp_port` INTEGER DEFAULT 25, `smtp_use_ssl_tls` INTEGER DEFAULT 0, `smtp_use_starttls` INTEGER DEFAULT 0, `smtp_auth_mechanisms` TEXT, `smtp_use_custom_sign` INTEGER DEFAULT 0, `smtp_username` TEXT DEFAULT NULL, `smtp_password` TEXT DEFAULT NULL, `contacts_loaded` INTEGER DEFAULT 0, `show_only_encrypted` INTEGER DEFAULT 0, `client_configuration` TEXT DEFAULT NULL, `use_api` INTEGER NOT NULL DEFAULT 0, `use_customer_fes_url` INTEGER NOT NULL DEFAULT 0, `service_pgp_passphrase` TEXT NOT NULL, `service_pgp_private_key` BLOB NOT NULL, `signature` TEXT DEFAULT NULL, `use_alias_signatures` INTEGER NOT NULL DEFAULT 0, `use_conversation_mode` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountType",
+            "columnName": "account_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "display_name",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "givenName",
+            "columnName": "given_name",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "photoUrl",
+            "columnName": "photo_url",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isEnabled",
+            "columnName": "is_enabled",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "isActive",
+            "columnName": "is_active",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imapServer",
+            "columnName": "imap_server",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imapPort",
+            "columnName": "imap_port",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "143"
+          },
+          {
+            "fieldPath": "imapUseSslTls",
+            "columnName": "imap_use_ssl_tls",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "imapUseStarttls",
+            "columnName": "imap_use_starttls",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "imapAuthMechanisms",
+            "columnName": "imap_auth_mechanisms",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "smtpServer",
+            "columnName": "smtp_server",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "smtpPort",
+            "columnName": "smtp_port",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "25"
+          },
+          {
+            "fieldPath": "smtpUseSslTls",
+            "columnName": "smtp_use_ssl_tls",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "smtpUseStarttls",
+            "columnName": "smtp_use_starttls",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "smtpAuthMechanisms",
+            "columnName": "smtp_auth_mechanisms",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "smtpUseCustomSign",
+            "columnName": "smtp_use_custom_sign",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "smtpUsername",
+            "columnName": "smtp_username",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "smtpPassword",
+            "columnName": "smtp_password",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "contactsLoaded",
+            "columnName": "contacts_loaded",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "showOnlyEncrypted",
+            "columnName": "show_only_encrypted",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "clientConfiguration",
+            "columnName": "client_configuration",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "useAPI",
+            "columnName": "use_api",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "useCustomerFesUrl",
+            "columnName": "use_customer_fes_url",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "servicePgpPassphrase",
+            "columnName": "service_pgp_passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "servicePgpPrivateKey",
+            "columnName": "service_pgp_private_key",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "useAliasSignatures",
+            "columnName": "use_alias_signatures",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "useConversationMode",
+            "columnName": "use_conversation_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "email_account_type_in_accounts",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "account_type"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `email_account_type_in_accounts` ON `${TABLE_NAME}` (`email`, `account_type`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "action_queue",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `email` TEXT NOT NULL, `action_type` TEXT NOT NULL, `action_json` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionType",
+            "columnName": "action_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionJson",
+            "columnName": "action_json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "attachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `account` TEXT NOT NULL, `account_type` TEXT NOT NULL, `folder` TEXT NOT NULL, `uid` INTEGER NOT NULL, `name` TEXT NOT NULL, `encodedSize` INTEGER DEFAULT 0, `type` TEXT NOT NULL, `attachment_id` TEXT, `file_uri` TEXT, `forwarded_folder` TEXT, `forwarded_uid` INTEGER DEFAULT -1, `decrypt_when_forward` INTEGER NOT NULL DEFAULT 0, `path` TEXT NOT NULL, FOREIGN KEY(`account`, `account_type`, `folder`, `uid`) REFERENCES `messages`(`account`, `account_type`, `folder`, `uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account",
+            "columnName": "account",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountType",
+            "columnName": "account_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folder",
+            "columnName": "folder",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encodedSize",
+            "columnName": "encodedSize",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachmentId",
+            "columnName": "attachment_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fileUri",
+            "columnName": "file_uri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "forwardedFolder",
+            "columnName": "forwarded_folder",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "forwardedUid",
+            "columnName": "forwarded_uid",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "-1"
+          },
+          {
+            "fieldPath": "decryptWhenForward",
+            "columnName": "decrypt_when_forward",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "path",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "account_account_type_folder_uid_in_attachments",
+            "unique": false,
+            "columnNames": [
+              "account",
+              "account_type",
+              "folder",
+              "uid"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `account_account_type_folder_uid_in_attachments` ON `${TABLE_NAME}` (`account`, `account_type`, `folder`, `uid`)"
+          },
+          {
+            "name": "account_account_type_folder_uid_path_in_attachments",
+            "unique": true,
+            "columnNames": [
+              "account",
+              "account_type",
+              "folder",
+              "uid",
+              "path"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `account_account_type_folder_uid_path_in_attachments` ON `${TABLE_NAME}` (`account`, `account_type`, `folder`, `uid`, `path`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "account",
+              "account_type",
+              "folder",
+              "uid"
+            ],
+            "referencedColumns": [
+              "account",
+              "account_type",
+              "folder",
+              "uid"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `email` TEXT NOT NULL, `name` TEXT DEFAULT NULL, `last_use` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "lastUse",
+            "columnName": "last_use",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "name_in_recipients",
+            "unique": false,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `name_in_recipients` ON `${TABLE_NAME}` (`name`)"
+          },
+          {
+            "name": "last_use_in_recipients",
+            "unique": false,
+            "columnNames": [
+              "last_use"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `last_use_in_recipients` ON `${TABLE_NAME}` (`last_use`)"
+          },
+          {
+            "name": "email_in_recipients",
+            "unique": true,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `email_in_recipients` ON `${TABLE_NAME}` (`email`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "keys",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `fingerprint` TEXT NOT NULL, `account` TEXT NOT NULL, `account_type` TEXT DEFAULT NULL, `source` TEXT NOT NULL, `private_key` BLOB NOT NULL, `passphrase` TEXT DEFAULT NULL, `passphrase_type` INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(`account`, `account_type`) REFERENCES `accounts`(`email`, `account_type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fingerprint",
+            "columnName": "fingerprint",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account",
+            "columnName": "account",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountType",
+            "columnName": "account_type",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "storedPassphrase",
+            "columnName": "passphrase",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "passphraseType",
+            "columnName": "passphrase_type",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "account_account_type_in_keys",
+            "unique": false,
+            "columnNames": [
+              "account",
+              "account_type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `account_account_type_in_keys` ON `${TABLE_NAME}` (`account`, `account_type`)"
+          },
+          {
+            "name": "fingerprint_account_account_type_in_keys",
+            "unique": true,
+            "columnNames": [
+              "fingerprint",
+              "account",
+              "account_type"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `fingerprint_account_account_type_in_keys` ON `${TABLE_NAME}` (`fingerprint`, `account`, `account_type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "accounts",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "account",
+              "account_type"
+            ],
+            "referencedColumns": [
+              "email",
+              "account_type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "labels",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `email` TEXT NOT NULL, `account_type` TEXT DEFAULT NULL, `name` TEXT NOT NULL, `alias` TEXT DEFAULT NULL, `is_custom` INTEGER NOT NULL DEFAULT 0, `messages_total` INTEGER NOT NULL DEFAULT 0, `message_unread` INTEGER NOT NULL DEFAULT 0, `attributes` TEXT DEFAULT NULL, `next_page_token` TEXT DEFAULT NULL, `history_id` TEXT DEFAULT NULL, `label_color` TEXT DEFAULT NULL, `text_color` TEXT DEFAULT NULL, `label_list_visibility` TEXT NOT NULL DEFAULT 'labelShow', FOREIGN KEY(`email`, `account_type`) REFERENCES `accounts`(`email`, `account_type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountType",
+            "columnName": "account_type",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alias",
+            "columnName": "alias",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isCustom",
+            "columnName": "is_custom",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "messagesTotal",
+            "columnName": "messages_total",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "messagesUnread",
+            "columnName": "message_unread",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "attributes",
+            "columnName": "attributes",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "nextPageToken",
+            "columnName": "next_page_token",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "historyId",
+            "columnName": "history_id",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "labelColor",
+            "columnName": "label_color",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "textColor",
+            "columnName": "text_color",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "labelListVisibility",
+            "columnName": "label_list_visibility",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'labelShow'"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "email_account_type_name_in_labels",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "account_type",
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `email_account_type_name_in_labels` ON `${TABLE_NAME}` (`email`, `account_type`, `name`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "accounts",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email",
+              "account_type"
+            ],
+            "referencedColumns": [
+              "email",
+              "account_type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `account` TEXT NOT NULL, `account_type` TEXT NOT NULL, `folder` TEXT NOT NULL, `uid` INTEGER NOT NULL, `received_date` INTEGER DEFAULT NULL, `sent_date` INTEGER DEFAULT NULL, `from_addresses` TEXT DEFAULT NULL, `to_addresses` TEXT DEFAULT NULL, `cc_addresses` TEXT DEFAULT NULL, `reply_to_addresses` TEXT DEFAULT NULL, `subject` TEXT DEFAULT NULL, `flags` TEXT DEFAULT NULL, `has_attachments` INTEGER DEFAULT 0, `is_new` INTEGER DEFAULT -1, `state` INTEGER DEFAULT -1, `attachments_directory` TEXT, `error_message` TEXT DEFAULT NULL, `password` BLOB DEFAULT NULL, `is_visible` INTEGER NOT NULL DEFAULT 1, `thread_id` INTEGER DEFAULT NULL, `history_id` TEXT DEFAULT NULL, `draft_id` TEXT DEFAULT NULL, `label_ids` TEXT DEFAULT NULL, `is_encrypted` INTEGER DEFAULT -1, `has_pgp` INTEGER DEFAULT 0, `thread_messages_count` INTEGER DEFAULT NULL, `thread_drafts_count` INTEGER DEFAULT NULL, `snippet` TEXT DEFAULT NULL, FOREIGN KEY(`account`, `account_type`) REFERENCES `accounts`(`email`, `account_type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account",
+            "columnName": "account",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountType",
+            "columnName": "account_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folder",
+            "columnName": "folder",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "receivedDate",
+            "columnName": "received_date",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "sentDate",
+            "columnName": "sent_date",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "fromAddresses",
+            "columnName": "from_addresses",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "toAddresses",
+            "columnName": "to_addresses",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "ccAddresses",
+            "columnName": "cc_addresses",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "replyToAddresses",
+            "columnName": "reply_to_addresses",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isNew",
+            "columnName": "is_new",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "-1"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "-1"
+          },
+          {
+            "fieldPath": "attachmentsDirectory",
+            "columnName": "attachments_directory",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "errorMsg",
+            "columnName": "error_message",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isVisible",
+            "columnName": "is_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "threadId",
+            "columnName": "thread_id",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "historyId",
+            "columnName": "history_id",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "draftId",
+            "columnName": "draft_id",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "labelIds",
+            "columnName": "label_ids",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isEncrypted",
+            "columnName": "is_encrypted",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "-1"
+          },
+          {
+            "fieldPath": "hasPgp",
+            "columnName": "has_pgp",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "threadMessagesCount",
+            "columnName": "thread_messages_count",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "threadDraftsCount",
+            "columnName": "thread_drafts_count",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "snippet",
+            "columnName": "snippet",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "account_account_type_in_messages",
+            "unique": false,
+            "columnNames": [
+              "account",
+              "account_type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `account_account_type_in_messages` ON `${TABLE_NAME}` (`account`, `account_type`)"
+          },
+          {
+            "name": "uid_in_messages",
+            "unique": false,
+            "columnNames": [
+              "uid"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `uid_in_messages` ON `${TABLE_NAME}` (`uid`)"
+          },
+          {
+            "name": "account_account_type_folder_uid_in_messages",
+            "unique": true,
+            "columnNames": [
+              "account",
+              "account_type",
+              "folder",
+              "uid"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `account_account_type_folder_uid_in_messages` ON `${TABLE_NAME}` (`account`, `account_type`, `folder`, `uid`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "accounts",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "account",
+              "account_type"
+            ],
+            "referencedColumns": [
+              "email",
+              "account_type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "public_keys",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `recipient` TEXT NOT NULL, `fingerprint` TEXT NOT NULL, `public_key` BLOB NOT NULL, FOREIGN KEY(`recipient`) REFERENCES `recipients`(`email`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fingerprint",
+            "columnName": "fingerprint",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKey",
+            "columnName": "public_key",
+            "affinity": "BLOB",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "recipient_fingerprint_in_public_keys",
+            "unique": true,
+            "columnNames": [
+              "recipient",
+              "fingerprint"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `recipient_fingerprint_in_public_keys` ON `${TABLE_NAME}` (`recipient`, `fingerprint`)"
+          },
+          {
+            "name": "recipient_in_public_keys",
+            "unique": false,
+            "columnNames": [
+              "recipient"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `recipient_in_public_keys` ON `${TABLE_NAME}` (`recipient`)"
+          },
+          {
+            "name": "fingerprint_in_public_keys",
+            "unique": false,
+            "columnNames": [
+              "fingerprint"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `fingerprint_in_public_keys` ON `${TABLE_NAME}` (`fingerprint`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "recipients",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "recipient"
+            ],
+            "referencedColumns": [
+              "email"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "account_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `account` TEXT NOT NULL, `account_type` TEXT DEFAULT NULL, `check_pass_phrase_attempts_count` INTEGER NOT NULL DEFAULT 0, `last_unsuccessful_check_pass_phrase_attempt_time` INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(`account`, `account_type`) REFERENCES `accounts`(`email`, `account_type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account",
+            "columnName": "account",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountType",
+            "columnName": "account_type",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "checkPassPhraseAttemptsCount",
+            "columnName": "check_pass_phrase_attempts_count",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "lastUnsuccessfulCheckPassPhraseAttemptTime",
+            "columnName": "last_unsuccessful_check_pass_phrase_attempt_time",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "account_account_type_in_account_settings",
+            "unique": true,
+            "columnNames": [
+              "account",
+              "account_type"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `account_account_type_in_account_settings` ON `${TABLE_NAME}` (`account`, `account_type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "accounts",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "account",
+              "account_type"
+            ],
+            "referencedColumns": [
+              "email",
+              "account_type"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6bf4da204f47555b619b66c37ca5e392')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/cryptup_reply_div_should_be_hidden_in_FES_messages.json b/FlowCrypt/src/androidTest/assets/messages/info/cryptup_reply_div_should_be_hidden_in_FES_messages.json
index 9e27d903fe..638e0cbfdc 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/cryptup_reply_div_should_be_hidden_in_FES_messages.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/cryptup_reply_div_should_be_hidden_in_FES_messages.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,7 +18,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "fromAddress": "default@flowcrypt.test",
+    "fromAddresses": "default@flowcrypt.test",
     "hasAttachments": false,
     "id": 45,
     "isDraft": false,
@@ -27,7 +28,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1702893775000,
-    "replyTo": "default@flowcrypt.test",
+    "replyToAddresses": "default@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "default@flowcrypt.test"
@@ -40,7 +41,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 57,
     "uidAsHEX": "39"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json
index 26beb5f18e..a566301402 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json
@@ -21,7 +21,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -31,14 +32,14 @@
         "personal": "Denys"
       }
     ],
-    "fromAddress": "Denys \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denys \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 32,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1619781764000,
-    "replyTo": "Denys \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denys \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -53,7 +54,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 17
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json
index cc24e0214d..2f63c56aa3 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,13 +18,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 429,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1632754787000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -36,7 +37,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 21,
     "uidAsHEX": "15",
     "isEncrypted": true
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json
index 1790575415..aff22fb0e1 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json
@@ -22,7 +22,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -30,14 +31,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 66,
     "isSeen": true,
     "isEncrypted": true,
     "msgState": "NONE",
     "receivedDate": 1633423230000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -50,7 +51,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 24,
     "uidAsHEX": "18"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json
index ce73cfdf98..09e54cfc02 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -18,13 +19,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 61,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1623067471000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -37,7 +38,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 18,
     "uidAsHEX": "12"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_multipart_alternative_pgp_in_text_plain.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_multipart_alternative_pgp_in_text_plain.json
index f8916118ca..597050ff14 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_multipart_alternative_pgp_in_text_plain.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_multipart_alternative_pgp_in_text_plain.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -19,7 +20,7 @@
         "personal": "Default User"
       }
     ],
-    "fromAddress": "Default User \u003cdefault@flowcrypt.test\u003e",
+    "fromAddresses": "Default User \u003cdefault@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 149,
     "isDraft": false,
@@ -29,7 +30,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1671805307000,
-    "replyTo": "Default User \u003cdefault@flowcrypt.test\u003e",
+    "replyToAddresses": "Default User \u003cdefault@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "default@flowcrypt.test",
@@ -44,7 +45,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 51,
     "uidAsHEX": "33"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json
index 931b682d49..8ac47c2325 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -18,14 +19,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 27,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1619763416000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 14
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json
index 0b1717b427..0459541b68 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json
@@ -22,7 +22,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -32,7 +33,7 @@
         "personal": "Denis Bondarenko"
       }
     ],
-    "fromAddress": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 8,
     "isEncrypted": true,
@@ -40,7 +41,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1601910126000,
-    "replyTo": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -55,7 +56,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 12,
     "uidAsHEX": "c"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json
index bd5a5040cb..3a0a89572f 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json
@@ -35,7 +35,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -43,13 +44,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 7,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1601898640000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -62,7 +63,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 10,
     "isEncrypted": true
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json
index f307fc2eb3..b82cbc0955 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json
@@ -36,7 +36,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -44,14 +45,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 31,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1619779853000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -64,7 +65,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 16
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json
index 7b264f89c8..cc72603146 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -18,14 +19,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 31,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1619779853000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -39,7 +40,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 16
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json
index 981f38093b..1716f537d3 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -18,14 +19,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 25,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1619763315000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 12
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json
index 07644c265d..a78ffc0f76 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json
@@ -47,7 +47,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -55,14 +56,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 26,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1619763373000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -76,7 +77,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 13
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json
index efad0decd1..74805a4efd 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json
@@ -1531,7 +1531,8 @@
   "msgEntity": {
     "isEncrypted": true,
     "cc": [],
-    "email": "denbond7@flowcrypt.test",
+    "account": "denbond7@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -1539,7 +1540,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "fromAddress": "default@flowcrypt.test",
+    "fromAddresses": "default@flowcrypt.test",
     "hasAttachments": true,
     "id": 39,
     "isNew": false,
@@ -1547,7 +1548,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1655473637000,
-    "replyTo": "default@flowcrypt.test",
+    "replyToAddresses": "default@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "default@flowcrypt.test"
@@ -1560,7 +1561,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "toAddress": "denbond7@flowcrypt.test",
+    "toAddresses": "denbond7@flowcrypt.test",
     "uid": 2,
     "uidAsHEX": "2"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json
index e791cd8503..267428367c 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json
@@ -17,7 +17,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\RECENT \\SEEN",
     "folder": "INBOX",
     "from": [
@@ -25,7 +26,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 26,
     "isEncrypted": true,
@@ -33,7 +34,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1633527418000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -46,7 +47,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 25,
     "uidAsHEX": "19"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json
index 1098fe06e9..42e52e3ae0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json
@@ -25,7 +25,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -33,14 +34,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 17,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1623067471000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -54,7 +55,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 18,
     "uidAsHEX": "12"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json
index 264aeb4447..2c0e9487ca 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json
@@ -24,7 +24,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -32,13 +33,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 292,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1619763416000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -52,7 +53,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 14,
     "uidAsHEX": "e"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json
index fea61690a3..5e040886fa 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,7 +18,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 647,
     "isEncrypted": true,
@@ -25,7 +26,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1633004932000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 22,
     "uidAsHEX": "16"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_not_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_not_signed.json
index 11e8b54d08..0dee3bfbdf 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_not_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_not_signed.json
@@ -2443,7 +2443,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -2453,7 +2454,7 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 267,
     "isDraft": false,
@@ -2464,7 +2465,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1685519027000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -2479,7 +2480,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 55,
     "uidAsHEX": "37"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_signed.json
index 76d2c6a9ae..e899abbe97 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_subject_openpgp_mime_signed.json
@@ -55,7 +55,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -65,7 +66,7 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 265,
     "isDraft": false,
@@ -76,7 +77,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1685518857000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -91,7 +92,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 53,
     "uidAsHEX": "35"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json b/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json
index a96347eec2..1db1bcd9c0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,13 +18,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 33,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1640358384000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -36,7 +37,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 41,
     "uidAsHEX": "29"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json b/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json
index 1bf0ce15f3..df1f710edb 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -20,13 +21,13 @@
         "personal": "Denis Bondarenko"
       }
     ],
-    "fromAddress": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 14,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1601916912000,
-    "replyTo": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -40,7 +41,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 17
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_inline_with_inline_image.json b/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_inline_with_inline_image.json
index 6ea5d2356e..e81bd1d2c7 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_inline_with_inline_image.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_inline_with_inline_image.json
@@ -1216,7 +1216,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -1224,7 +1225,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 384,
     "isDraft": false,
@@ -1235,7 +1236,7 @@
     "isEncrypted": true,
     "msgState": "NONE",
     "receivedDate": 1706617630000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -1248,7 +1249,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 57,
     "uidAsHEX": "39"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_mime_with_inlined_attachments.json b/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_mime_with_inlined_attachments.json
index 7f1c535bab..327726c159 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_mime_with_inlined_attachments.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/open_pgp_mime_with_inlined_attachments.json
@@ -3739,7 +3739,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -3749,7 +3750,7 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 204,
     "isDraft": false,
@@ -3759,7 +3760,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1675349517000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -3774,7 +3775,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 52,
     "uidAsHEX": "34"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json
index d17de27659..7eb49049d2 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN ",
     "folder": "INBOX",
     "from": [
@@ -19,7 +20,7 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 40,
     "isNew": false,
@@ -27,7 +28,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1659711309000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -43,7 +44,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 48,
     "uidAsHEX": "30"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json
index 22c66ba39a..ab8aa452ec 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -19,14 +20,14 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 119,
     "isPasswordProtected": false,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1659688734000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -41,7 +42,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 45,
     "uidAsHEX": "2d"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json
index 4e048cf6c4..2037034967 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -19,14 +20,14 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 39,
     "isPasswordProtected": false,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1659708219000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -41,7 +42,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 47,
     "uidAsHEX": "2f"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json
index 18d6274955..66f251dd89 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -19,14 +20,14 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 38,
     "isPasswordProtected": false,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1659689377000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -41,7 +42,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 46,
     "uidAsHEX": "2e"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json
index 918edd6cff..399e08bd9e 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -19,14 +20,14 @@
         "personal": "Den"
       }
     ],
-    "fromAddress": "Den \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Den \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": true,
     "id": 70,
     "isPasswordProtected": false,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1644335053000,
-    "replyTo": "Den \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Den \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -42,7 +43,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 42,
     "uidAsHEX": "2a"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json
index 2c270765cb..24e3b80219 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json
@@ -788,7 +788,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -798,7 +799,7 @@
         "personal": "Denys"
       }
     ],
-    "fromAddress": "Denys \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denys \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": true,
     "id": 120,
     "isEncrypted": false,
@@ -806,7 +807,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1645091597000,
-    "replyTo": "Denys \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denys \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -821,7 +822,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 43,
     "uidAsHEX": "2b"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json
index cc97c27c80..4441bf10b1 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json
@@ -798,7 +798,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -808,7 +809,7 @@
         "personal": "Denys"
       }
     ],
-    "fromAddress": "Denys \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denys \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": true,
     "id": 121,
     "isEncrypted": false,
@@ -816,7 +817,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1645091727000,
-    "replyTo": "Denys \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denys \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -831,7 +832,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 44,
     "uidAsHEX": "2c"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json
index 52607f26ba..24f0d86e9e 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,14 +18,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 453,
     "isEncrypted": true,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639147807000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 32,
     "uidAsHEX": "20"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json
index 4e0231e97a..9461c821c0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,7 +18,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 460,
     "isEncrypted": true,
@@ -25,7 +26,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639377131000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -39,7 +40,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 37,
     "uidAsHEX": "25"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json
index 6ac034824c..7b5da6ab73 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -18,13 +19,13 @@
       }
     ],
     "isEncrypted": true,
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 456,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639223056000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 35,
     "uidAsHEX": "23"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json
index a934bb8172..45eb5b4b15 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,7 +18,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 497,
     "isEncrypted": true,
@@ -25,7 +26,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639402456000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 39,
     "uidAsHEX": "27"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json
index af8ecae826..55b78e573c 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,7 +18,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 499,
     "isEncrypted": false,
@@ -25,7 +26,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639402610000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 40,
     "uidAsHEX": "28"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json
index 2010bbe719..7ebf6bc7b9 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,14 +18,14 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 451,
     "isSeen": true,
     "isEncrypted": true,
     "msgState": "NONE",
     "receivedDate": 1639147522000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 29,
     "uidAsHEX": "1d"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json
index 54f582818e..e129abf44e 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,13 +18,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 452,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639147743000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -37,7 +38,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 31,
     "uidAsHEX": "1f"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json
index 546e779cdf..ced9de552a 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,7 +18,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 462,
     "isEncrypted": false,
@@ -25,7 +26,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639377556000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -39,7 +40,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 38,
     "uidAsHEX": "26"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json
index e39492b571..5af31ca6f1 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,13 +18,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 457,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1639223239000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -37,7 +38,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 36,
     "uidAsHEX": "24"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json
index 28c6ce4582..be9bb89cc7 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,14 +18,14 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "fromAddress": "default@flowcrypt.test",
+    "fromAddresses": "default@flowcrypt.test",
     "hasAttachments": false,
     "id": 70,
     "isNew": false,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1633967967000,
-    "replyTo": "default@flowcrypt.test",
+    "replyToAddresses": "default@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "default@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 26,
     "uidAsHEX": "1a"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json
index fdc0e2acdf..700ac20fc6 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -17,7 +18,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 327,
     "isEncrypted": false,
@@ -25,7 +26,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1634138754000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -38,7 +39,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 28,
     "uidAsHEX": "1c"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json
index 82defdb322..3feab30b92 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json
@@ -17,7 +17,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -25,7 +26,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": false,
     "id": 326,
     "isEncrypted": false,
@@ -34,7 +35,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1634138720000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -47,7 +48,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 27,
     "uidAsHEX": "1b"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json
index ebeca55a88..51bc1d911a 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -20,13 +21,13 @@
         "personal": "Denis Bondarenko"
       }
     ],
-    "fromAddress": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 50,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1601886754000,
-    "replyTo": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -40,7 +41,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 5
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json
index d2dbd37819..59a95d1041 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "Outbox",
     "from": [
@@ -20,12 +21,12 @@
         "personal": "Denis Bondarenko"
       }
     ],
-    "fromAddress": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 50,
     "isSeen": true,
     "msgState": "NONE",
-    "replyTo": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -39,7 +40,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 5
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json
index f99e9ccb7d..179ec2e296 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json
@@ -14,8 +14,9 @@
         "address": "ccuser@test"
       }
     ],
-    "ccAddress": "ccuser@test",
-    "email": "default@flowcrypt.test",
+    "ccAddresses": "ccuser@test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -25,13 +26,13 @@
         "personal": "Denis Bondarenko"
       }
     ],
-    "fromAddress": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 50,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1601886754000,
-    "replyTo": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -45,7 +46,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 5
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json
index e6df33ba09..ec96d47ac4 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -20,13 +21,13 @@
         "personal": "Denis Bondarenko"
       }
     ],
-    "fromAddress": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 50,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1601886754000,
-    "replyTo": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -44,7 +45,7 @@
         "address": "user@test"
       }
     ],
-    "toAddress": "default@flowcrypt.test, User <user@test>",
+    "toAddresses": "default@flowcrypt.test, User <user@test>",
     "uid": 5
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json
index e4500f1601..c0e27e3886 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json
@@ -10,7 +10,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -20,13 +21,13 @@
         "personal": "Denis Bondarenko"
       }
     ],
-    "fromAddress": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": true,
     "id": 52,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1601887254000,
-    "replyTo": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -40,7 +41,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 6
   },
   "verificationResult": {
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json
index 141f47faea..0400c27f61 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json
@@ -2,13 +2,14 @@
   "encryptionType": "STANDARD",
   "msgEntity": {
     "id": 42,
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "folder": "INBOX",
     "uid": 525,
     "receivedDate": 1569929137000,
     "sentDate": 1569929121000,
-    "fromAddress": "denbond7@flowcrypt.test",
-    "toAddress": "Alias <alias@flowcrypt.test>",
+    "fromAddresses": "denbond7@flowcrypt.test",
+    "toAddresses": "Alias <alias@flowcrypt.test>",
     "subject": "Honor reply-to address",
     "flags": "\\SEEN",
     "hasAttachments": false,
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json
index 3e461356c7..ed4a849277 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json
@@ -2,20 +2,21 @@
   "encryptionType": "STANDARD",
   "msgEntity": {
     "id": 42,
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "folder": "INBOX",
     "uid": 525,
     "receivedDate": 1569929137000,
     "sentDate": 1569929121000,
-    "fromAddress": "denbond7@flowcrypt.test",
-    "toAddress": "Default <default@flowcrypt.test>",
+    "fromAddresses": "denbond7@flowcrypt.test",
+    "toAddresses": "Default <default@flowcrypt.test>",
     "subject": "Honor reply-to address",
     "flags": "\\SEEN",
     "hasAttachments": false,
     "isEncrypted": false,
     "isNew": false,
     "state": -1,
-    "replyTo": "android@flowcrypt.test",
+    "replyToAddresses": "android@flowcrypt.test",
     "from": [
       {
         "address": "denbond7@flowcrypt.test"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key.json
index d14c134b17..95e16cd713 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key.json
@@ -42,7 +42,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -50,7 +51,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 99,
     "isDraft": false,
@@ -61,7 +62,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1668586938000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -74,7 +75,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 49,
     "uidAsHEX": "31"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json
index d79ee612d4..274ed8a9ee 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json
@@ -75,7 +75,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -83,13 +84,13 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 136,
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1638517997000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -102,7 +103,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 29,
     "uidAsHEX": "1d"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_updated_pub_key.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_updated_pub_key.json
index c339032e6e..849d295f33 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_updated_pub_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_updated_pub_key.json
@@ -790,7 +790,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -798,7 +799,7 @@
         "address": "denbond7@flowcrypt.test"
       }
     ],
-    "fromAddress": "denbond7@flowcrypt.test",
+    "fromAddresses": "denbond7@flowcrypt.test",
     "hasAttachments": true,
     "id": 103,
     "isDraft": false,
@@ -809,7 +810,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1668620798000,
-    "replyTo": "denbond7@flowcrypt.test",
+    "replyToAddresses": "denbond7@flowcrypt.test",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test"
@@ -822,7 +823,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 50,
     "uidAsHEX": "32"
   },
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/tiny_inline_attachment.json b/FlowCrypt/src/androidTest/assets/messages/info/tiny_inline_attachment.json
index 73e78d8e0a..e40f584fe0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/tiny_inline_attachment.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/tiny_inline_attachment.json
@@ -9,7 +9,8 @@
   ],
   "msgEntity": {
     "cc": [],
-    "email": "default@flowcrypt.test",
+    "account": "default@flowcrypt.test",
+    "accountType": "flowcrypt.test",
     "flags": "\\SEEN",
     "folder": "INBOX",
     "from": [
@@ -19,7 +20,7 @@
         "personal": "DenBond7"
       }
     ],
-    "fromAddress": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "fromAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "hasAttachments": false,
     "id": 431,
     "isDraft": false,
@@ -29,7 +30,7 @@
     "isSeen": true,
     "msgState": "NONE",
     "receivedDate": 1692102318000,
-    "replyTo": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
+    "replyToAddresses": "DenBond7 \u003cdenbond7@flowcrypt.test\u003e",
     "replyToAddress": [
       {
         "address": "denbond7@flowcrypt.test",
@@ -44,7 +45,7 @@
         "address": "default@flowcrypt.test"
       }
     ],
-    "toAddress": "default@flowcrypt.test",
+    "toAddresses": "default@flowcrypt.test",
     "uid": 56,
     "uidAsHEX": "38"
   },
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/CustomAndroidJUnit4.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/CustomAndroidJUnit4.kt
new file mode 100644
index 0000000000..bb9d23f449
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/CustomAndroidJUnit4.kt
@@ -0,0 +1,151 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+package com.flowcrypt.email
+
+import org.junit.runner.Description
+import org.junit.runner.Runner
+import org.junit.runner.manipulation.Filter
+import org.junit.runner.manipulation.Filterable
+import org.junit.runner.manipulation.NoTestsRemainException
+import org.junit.runner.manipulation.Sortable
+import org.junit.runner.manipulation.Sorter
+import org.junit.runner.notification.RunNotifier
+import org.junit.runners.model.InitializationError
+import java.lang.reflect.Constructor
+import java.lang.reflect.InvocationTargetException
+import java.util.Locale
+
+/**
+ * Based on [androidx.test.ext.junit.runners.AndroidJUnit4]
+ *
+ * @author Denys Bondarenko
+ */
+class CustomAndroidJUnit4(klass: Class<*>) : Runner(), Filterable, Sortable {
+  private val delegate: Runner = loadRunner(klass)
+
+  override fun getDescription(): Description {
+    return delegate.description
+  }
+
+  override fun run(runNotifier: RunNotifier) {
+    delegate.run(runNotifier)
+  }
+
+  @Throws(NoTestsRemainException::class)
+  override fun filter(filter: Filter) {
+    (delegate as Filterable).filter(filter)
+  }
+
+  override fun sort(sorter: Sorter) {
+    (delegate as Sortable).sort(sorter)
+  }
+
+  companion object {
+    private const val TAG = "AndroidJUnit4"
+
+    private val runnerClassName: String
+      get() {
+        val runnerClassName =
+          System.getProperty("android.junit.runner", null)
+            ?: return if (
+              System.getProperty("java.runtime.name")
+                ?.lowercase(Locale.getDefault())?.contains("android") == false
+              && hasClass("org.robolectric.RobolectricTestRunner")
+            ) {
+              "org.robolectric.RobolectricTestRunner"
+            } else {
+              "androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner"
+            }
+        return runnerClassName
+      }
+
+    private fun hasClass(className: String): Boolean {
+      return try {
+        Class.forName(className) != null
+      } catch (e: ClassNotFoundException) {
+        false
+      }
+    }
+
+    @Throws(InitializationError::class)
+    private fun loadRunner(testClass: Class<*>): Runner {
+      val runnerClassName = runnerClassName
+      return loadRunner(testClass, runnerClassName)
+    }
+
+    @Throws(InitializationError::class)
+    private fun loadRunner(testClass: Class<*>, runnerClassName: String): Runner {
+      var runnerClass: Class<out Runner?>? = null
+      try {
+        runnerClass = Class.forName(runnerClassName) as Class<out Runner?>
+      } catch (e: ClassNotFoundException) {
+        throwInitializationError(
+          String.format(
+            "Delegate runner %s for AndroidJUnit4 could not be found.\n", runnerClassName
+          ),
+          e
+        )
+      }
+
+      var constructor: Constructor<out Runner?>? = null
+      try {
+        constructor = runnerClass!!.getConstructor(Class::class.java)
+      } catch (e: NoSuchMethodException) {
+        throwInitializationError(
+          String.format(
+            "Delegate runner %s for AndroidJUnit4 requires a public constructor that takes a"
+                + " Class<?>.\n",
+            runnerClassName
+          ),
+          e
+        )
+      }
+
+      try {
+        return constructor!!.newInstance(testClass)!!
+      } catch (e: IllegalAccessException) {
+        throwInitializationError(
+          String.format("Illegal constructor access for test runner %s\n", runnerClassName), e
+        )
+      } catch (e: InstantiationException) {
+        throwInitializationError(
+          String.format("Failed to instantiate test runner %s\n", runnerClassName), e
+        )
+      } catch (e: InvocationTargetException) {
+        val details = getInitializationErrorDetails(e, testClass)
+        throwInitializationError(
+          String.format("Failed to instantiate test runner %s\n%s\n", runnerClass, details), e
+        )
+      }
+      throw IllegalStateException("Should never reach here")
+    }
+
+    @Throws(InitializationError::class)
+    private fun throwInitializationError(details: String, cause: Throwable) {
+      throw InitializationError(RuntimeException(details, cause))
+    }
+
+    private fun getInitializationErrorDetails(throwable: Throwable, testClass: Class<*>): String {
+      val innerCause = StringBuilder()
+      val cause = throwable.cause ?: return ""
+
+      val causeClass: Class<out Throwable> = cause.javaClass
+      if (causeClass == InitializationError::class.java) {
+        val initializationError = cause as InitializationError
+        val testClassProblemList = initializationError.causes
+        innerCause.append(
+          String.format(
+            "Test class %s is malformed. (%s problems):\n",
+            testClass, testClassProblemList.size
+          )
+        )
+        for (testClassProblem in testClassProblemList) {
+          innerCause.append(testClassProblem).append("\n")
+        }
+      }
+      return innerCause.toString()
+    }
+  }
+}
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
index 01792a9a2e..4374926d7a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.base
@@ -41,6 +41,7 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
+import com.flowcrypt.email.BuildConfig
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.MsgsCacheManager
 import com.flowcrypt.email.api.email.model.AttachmentInfo
@@ -287,6 +288,17 @@ abstract class BaseTest : BaseActivityTestImplementation {
     device.wait(Until.hasObject(By.text(text)), timeoutInMilliseconds)
   }
 
+  protected fun waitForObjectWithResourceName(
+    resourceName: String,
+    timeoutInMilliseconds: Long = 0
+  ) {
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    device.wait(
+      Until.hasObject(By.res("${BuildConfig.APPLICATION_ID}:id/$resourceName")),
+      timeoutInMilliseconds
+    )
+  }
+
   fun getTargetContext(): Context {
     return InstrumentationRegistry.getInstrumentation().targetContext
   }
@@ -308,13 +320,13 @@ abstract class BaseTest : BaseActivityTestImplementation {
     )
     val incomingMsgInfo = action?.invoke(defaultIncomingMsgInfo) ?: defaultIncomingMsgInfo
     incomingMsgInfo?.msgEntity?.let {
+      roomDatabase.msgDao().deleteByUIDs(it.account, it.folder, listOf(it.uid))
       val uri = roomDatabase.msgDao().insert(it)
-      val attEntities = mutableListOf<AttachmentEntity>()
-
-      for (attInfo in atts) {
-        attInfo?.let { info ->
-          AttachmentEntity.fromAttInfo(info)?.let { candidate -> attEntities.add(candidate) }
-        }
+      val attEntities = atts.mapNotNull { attachmentInfo ->
+        if (attachmentInfo != null) AttachmentEntity.fromAttInfo(
+          attachmentInfo,
+          accountEntity.accountType
+        ) else null
       }
 
       roomDatabase.attachmentDao().insert(attEntities)
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt
index cedaa5e82c..6d6085c1a5 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database
@@ -50,6 +50,7 @@ class MigrationTest {
     FlowCryptRoomDatabase.Migration42to43(InstrumentationRegistry.getInstrumentation().targetContext),
     FlowCryptRoomDatabase.MIGRATION_43_44,
     FlowCryptRoomDatabase.MIGRATION_44_45,
+    FlowCryptRoomDatabase.MIGRATION_45_46,
   )
 
   @get:Rule
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/OutgoingMessageConfiguration.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/OutgoingMessageConfiguration.kt
index 8a044b6294..5b2a7623a9 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/OutgoingMessageConfiguration.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/OutgoingMessageConfiguration.kt
@@ -25,6 +25,5 @@ annotation class OutgoingMessageConfiguration(
   val subject: String,
   val message: String,
   val isNew: Boolean = true,
-  val timeoutToWaitSendingInMilliseconds: Long = 15000L,
-  val timeoutBeforeMovingToComposeInMilliseconds: Long = 0L
+  val timeoutToWaitSendingInMilliseconds: Long = 15000L
 )
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt
index f8e857738d..108f08be59 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.matchers
@@ -19,6 +19,7 @@ import androidx.test.espresso.Root
 import androidx.test.espresso.matcher.BoundedMatcher
 import com.flowcrypt.email.api.email.model.SecurityType
 import com.flowcrypt.email.extensions.kotlin.parseAsColorBasedOnDefaultSettings
+import com.flowcrypt.email.ui.adapter.MessageHeadersListAdapter
 import com.flowcrypt.email.ui.adapter.PgpBadgeListAdapter
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.chip.Chip
@@ -144,5 +145,14 @@ class CustomMatchers {
     fun withTextContentMatcher(matcher: Matcher<String>): CustomWithTextContentMatcher {
       return CustomWithTextContentMatcher(matcher)
     }
+
+    fun withMessageHeaderInfo(header: MessageHeadersListAdapter.Header):
+        MessageHeadersListAdapterViewHolderMatcher {
+      return MessageHeadersListAdapterViewHolderMatcher(header)
+    }
+
+    fun hasItemAtPosition(position: Int, matcher: Matcher<View>): RecyclerViewHasViewAtPosition {
+      return RecyclerViewHasViewAtPosition(position, matcher)
+    }
   }
 }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/DrawableMatcher.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/DrawableMatcher.kt
index 7fb1f68ad8..b874da8297 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/DrawableMatcher.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/DrawableMatcher.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.matchers
@@ -13,6 +13,7 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
+import com.google.android.material.button.MaterialButton
 import org.hamcrest.Description
 import org.hamcrest.TypeSafeMatcher
 
@@ -39,15 +40,20 @@ class DrawableMatcher(
   }
 
   override fun matchesSafely(target: View): Boolean {
-    if (target !is ImageView) {
+    if (!(target is ImageView || target is MaterialButton)) {
       return false
     }
 
-    val context = target.getContext()
+    val context = target.context
+    val drawable = when (target) {
+      is ImageView -> target.drawable
+      is MaterialButton -> target.icon
+      else -> null
+    }
 
     when (expectedId) {
-      EMPTY -> return target.drawable == null
-      ANY -> return target.drawable != null
+      EMPTY -> return drawable == null
+      ANY -> return drawable != null
       else -> {
         val resources = context.resources
         resourceName = resources.getResourceEntryName(expectedId)
@@ -59,10 +65,10 @@ class DrawableMatcher(
           }
         } ?: return false
 
-        val actualBitmap = target.drawable.toBitmap()
+        val actualBitmap = drawable?.toBitmap()
         val expectedBitmap = expectedDrawable.toBitmap()
 
-        return actualBitmap.sameAs(expectedBitmap)
+        return actualBitmap?.sameAs(expectedBitmap) == true
       }
     }
   }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/MessageHeadersListAdapterViewHolderMatcher.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/MessageHeadersListAdapterViewHolderMatcher.kt
new file mode 100644
index 0000000000..088804eabf
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/MessageHeadersListAdapterViewHolderMatcher.kt
@@ -0,0 +1,28 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.matchers
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.matcher.BoundedMatcher
+import com.flowcrypt.email.ui.adapter.MessageHeadersListAdapter
+import org.hamcrest.Description
+
+/**
+ * @author Denys Bondarenko
+ */
+class MessageHeadersListAdapterViewHolderMatcher(
+  private val header: MessageHeadersListAdapter.Header
+) : BoundedMatcher<RecyclerView.ViewHolder,
+    MessageHeadersListAdapter.ViewHolder>(MessageHeadersListAdapter.ViewHolder::class.java) {
+  override fun matchesSafely(holder: MessageHeadersListAdapter.ViewHolder): Boolean {
+    return holder.binding.tVHeaderName.text.toString() == header.name
+        && holder.binding.tVHeaderValue.text.toString() == header.value
+  }
+
+  override fun describeTo(description: Description) {
+    description.appendText("with: $header")
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/RecyclerViewHasViewAtPosition.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/RecyclerViewHasViewAtPosition.kt
new file mode 100644
index 0000000000..9b16dae6a7
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/RecyclerViewHasViewAtPosition.kt
@@ -0,0 +1,28 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.matchers
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.matcher.BoundedMatcher
+import org.hamcrest.Matcher
+
+/**
+ * @author Denys Bondarenko
+ */
+class RecyclerViewHasViewAtPosition(private val position: Int, private val matcher: Matcher<View>) :
+  BoundedMatcher<View, RecyclerView>(RecyclerView::class.java) {
+
+  override fun matchesSafely(item: RecyclerView?): Boolean {
+    val viewHolder = item?.findViewHolderForAdapterPosition(position)
+    return matcher.matches(viewHolder?.itemView)
+  }
+
+  override fun describeTo(description: org.hamcrest.Description?) {
+    description?.appendText("has item at position $position : ")
+    matcher.describeTo(description)
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/AddAttachmentToDatabaseRule.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/AddAttachmentToDatabaseRule.kt
deleted file mode 100644
index ba460862e5..0000000000
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/AddAttachmentToDatabaseRule.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
- */
-
-package com.flowcrypt.email.rules
-
-import com.flowcrypt.email.api.email.model.AttachmentInfo
-import com.flowcrypt.email.database.FlowCryptRoomDatabase
-import com.flowcrypt.email.database.entity.AttachmentEntity
-
-/**
- * @author Denys Bondarenko
- */
-class AddAttachmentToDatabaseRule(val attInfo: AttachmentInfo) : BaseRule() {
-  override fun execute() {
-    saveAttToDatabase()
-  }
-
-  private fun saveAttToDatabase() {
-    AttachmentEntity.fromAttInfo(attInfo)?.let {
-      FlowCryptRoomDatabase.getDatabase(targetContext).attachmentDao().insert(it)
-    }
-  }
-}
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/AddMessageToDatabaseRule.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/AddMessageToDatabaseRule.kt
index 4e5b53344d..ed34e7268d 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/AddMessageToDatabaseRule.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/AddMessageToDatabaseRule.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.rules
@@ -11,12 +11,12 @@ import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
 import com.google.android.gms.auth.GoogleAuthException
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.FetchProfile
 import jakarta.mail.Folder
 import jakarta.mail.Message
 import jakarta.mail.MessagingException
 import jakarta.mail.UIDFolder
+import org.eclipse.angus.mail.imap.IMAPFolder
 import java.io.IOException
 
 /**
@@ -64,7 +64,8 @@ class AddMessageToDatabaseRule(val account: AccountEntity, val localFolder: Loca
   private fun saveMsgToDatabase() {
     message?.let {
       val msgEntity = MessageEntity.genMsgEntity(
-        email = account.email,
+        account = account.email,
+        accountType = account.accountType,
         label = localFolder.fullName,
         msg = it,
         uid = 0,
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/Repeat.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/Repeat.kt
index 98150753fe..64ea777cc6 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/Repeat.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/Repeat.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.rules
@@ -11,6 +11,6 @@ package com.flowcrypt.email.rules
 @Retention()
 @Target(
   AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER,
-  AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.ANNOTATION_CLASS
+  AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS
 )
 annotation class Repeat(val value: Int = 1)
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/RepeatRule.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/RepeatRule.kt
index 2aec3f300b..a87bdc2b81 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/RepeatRule.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/RepeatRule.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.rules
@@ -27,7 +27,7 @@ class RepeatRule(private val retryCount: Int = 3) : BaseRule() {
             base.evaluate()
             println(description.displayName.toString() + ": run " + (i + 1) + " completed")
           } catch (t: Throwable) {
-            System.err.println(description.displayName.toString() + ": run " + (i + 1) + " failed")
+            System.err.println(description.displayName.toString() + ": run " + (i + 1) + " of $attempts failed")
             throw t
           }
         }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/ScreenshotTestRule.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/ScreenshotTestRule.kt
index 4b4417f8cd..b6fbe2371a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/ScreenshotTestRule.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/rules/ScreenshotTestRule.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.rules
@@ -13,6 +13,7 @@ import android.webkit.MimeTypeMap
 import androidx.test.core.app.canTakeScreenshot
 import androidx.test.core.app.takeScreenshot
 import androidx.test.platform.app.InstrumentationRegistry
+import com.flowcrypt.email.extensions.kotlin.getPossibleAndroidMimeType
 import org.apache.commons.io.FilenameUtils
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
@@ -49,7 +50,7 @@ class ScreenshotTestRule : TestWatcher() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val contentResolver = context.contentResolver
         val fileExtension = FilenameUtils.getExtension(filename).lowercase()
-        val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension)
+        val mimeType = filename.getPossibleAndroidMimeType()
 
         val contentValues = ContentValues().apply {
           put(MediaStore.Images.Media.DISPLAY_NAME, filename)
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt
index 06c2771f8f..67dc906a9e 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt
@@ -173,26 +173,28 @@ class AttachmentDownloadingWithRestrictionFlowTest : BaseMessageDetailsFlowTest(
       val incomingMessageInfo = getMsgInfo(
         path = "messages/info/standard_msg_info_plaintext_with_one_att.json",
         mimeMsgPath = "messages/mime/standard_msg_info_plaintext_with_one_att.txt",
-        simpleAttInfo,
+        atts = arrayOf(simpleAttInfo),
         accountEntity = addAccountToDatabaseRule.accountEntityWithDecryptedInfo
-      )
+      ) {
+        it?.copy(msgEntity = it.msgEntity.copy(accountType = AccountEntity.ACCOUNT_TYPE_GOOGLE))
+      }
 
       //close the notification bar if needed
       if (device.hasObject(By.res(NOTIFICATION_RESOURCES_NAME))) {
         device.pressBack()
       }
 
-      waitForObjectWithText(
-        requireNotNull(incomingMessageInfo?.text),
-        TimeUnit.SECONDS.toMillis(10)
-      )
-
-      waitForObjectWithText(
-        requireNotNull(simpleAttInfo?.name),
-        TimeUnit.SECONDS.toMillis(10)
-      )
+      baseCheckWithAtt(incomingMsgInfo = incomingMessageInfo, att = simpleAttInfo) {
+        waitForObjectWithText(
+          requireNotNull(incomingMessageInfo?.text),
+          TimeUnit.SECONDS.toMillis(10)
+        )
 
-      baseCheckWithAtt(incomingMsgInfo = incomingMessageInfo, att = simpleAttInfo)
+        waitForObjectWithText(
+          requireNotNull(simpleAttInfo?.name),
+          TimeUnit.SECONDS.toMillis(10)
+        )
+      }
 
       onView(withId(R.id.imageViewAttIcon))
         .check(matches(withDrawable(R.drawable.ic_attachment)))
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt
index b5e39cf0f8..a9da21ed06 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -9,6 +9,7 @@ import android.app.Activity
 import android.app.Instrumentation
 import android.content.ComponentName
 import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
@@ -87,6 +88,7 @@ import org.pgpainless.key.info.KeyRingInfo
 import java.io.File
 import java.net.HttpURLConnection
 import java.time.Instant
+import java.util.concurrent.TimeUnit
 
 /**
  * @author Denys Bondarenko
@@ -117,7 +119,11 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
   @Test
   fun testEmptyRecipient() {
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
+
+    waitForObjectWithText(
+      getResString(R.string.prompt_compose_security_email),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     onView(withId(R.id.recyclerViewChipsTo))
       .check(matches(isDisplayed()))
@@ -135,7 +141,10 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
   @Test
   fun testEmptyEmailSubject() {
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
+    waitForObjectWithText(
+      getResString(R.string.prompt_compose_security_email),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     onView(withId(R.id.editTextEmailAddress))
       .perform(
@@ -208,7 +217,10 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
   @Test
   fun testSwitchBetweenEncryptionTypes() {
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
+    waitForObjectWithText(
+      getResString(R.string.prompt_compose_security_email),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     val messageEncryptionType = defaultMsgEncryptionType
 
@@ -274,7 +286,10 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
   @Test
   fun testAddingAtts() {
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
+    waitForObjectWithText(
+      getResString(R.string.prompt_compose_security_email),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     onView(withId(R.id.editTextEmailAddress))
       .perform(
@@ -290,18 +305,12 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
   @Test
   fun testMaxTotalAttachmentSize() {
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
-
-    onView(withId(R.id.editTextEmailAddress))
-      .perform(
-        clearText(),
-        pressImeActionButton()
-      )
+    Espresso.closeSoftKeyboard()
 
     val fileWithBiggerSize = TestGeneralUtil.createFileWithGivenSize(
       Constants.MAX_TOTAL_ATTACHMENT_SIZE_IN_BYTES + 1024, temporaryFolderRule
     )
-    addAttachment(fileWithBiggerSize)
+    addAttachment(fileWithBiggerSize, 0)
 
     val sizeWarningMsg = getResString(
       R.string.template_warning_max_total_attachments_size,
@@ -320,7 +329,10 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
   @Test
   fun testDeletingAtts() {
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
+    waitForObjectWithText(
+      getResString(R.string.prompt_compose_security_email),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     onView(withId(R.id.editTextEmailAddress))
       .perform(
@@ -332,9 +344,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
       addAttAndCheck(att)
     }
 
-    //Need to wait while the layout will be updated. Some emulators work fast and fail this place
-    Thread.sleep(500)
-
     for (att in atts) {
       deleteAtt(att)
     }
@@ -515,7 +524,10 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
   @Test
   fun testSharePubKeySingle() {
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
+    waitForObjectWithText(
+      getResString(R.string.prompt_compose_security_email),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     openActionBarOverflowOrOptionsMenu(getTargetContext())
     onView(withText(R.string.include_public_key))
@@ -527,6 +539,11 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
       addPrivateKeyToDatabaseRule.accountEntity.email
     )
 
+    waitForObjectWithText(
+      requireNotNull(att?.name),
+      TimeUnit.SECONDS.toMillis(10)
+    )
+
     onView(withText(att?.name))
       .check(matches(isDisplayed()))
   }
@@ -577,7 +594,10 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
     )
 
     activeActivityRule?.launch(intent)
-    registerAllIdlingResources()
+    waitForObjectWithText(
+      getResString(R.string.prompt_compose_security_email),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     openActionBarOverflowOrOptionsMenu(getTargetContext())
     onView(withText(R.string.include_public_key))
@@ -585,6 +605,10 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
       .perform(click())
 
     val att = EmailUtil.genAttInfoFromPubKey(keyDetails, addAccountToDatabaseRule.account.email)
+    waitForObjectWithText(
+      requireNotNull(att?.name),
+      TimeUnit.SECONDS.toMillis(10)
+    )
 
     onView(withText(att?.name))
       .check(matches(isDisplayed()))
@@ -835,8 +859,11 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
       .check(doesNotExist())
   }
 
-  private fun addAttAndCheck(att: File) {
-    addAttachment(att)
+  private fun addAttAndCheck(
+    att: File,
+    waitingTimeoutInMilliseconds: Long = TimeUnit.SECONDS.toMillis(10)
+  ) {
+    addAttachment(att, waitingTimeoutInMilliseconds)
     onView(withText(att.name))
       .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
   }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/CreateMessageTestRecipientsDuringReplyAllFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/CreateMessageTestRecipientsDuringReplyAllFlowTest.kt
index 13185c3b13..f91d38c2e1 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/CreateMessageTestRecipientsDuringReplyAllFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/CreateMessageTestRecipientsDuringReplyAllFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -92,11 +92,12 @@ class CreateMessageTestRecipientsDuringReplyAllFlowTest : BaseComposeScreenTest(
     val incomingMessageInfo = IncomingMessageInfo(
       localFolder = localFolder,
       msgEntity = MessageEntity(
-        email = addAccountToDatabaseRule.account.email,
+        account = addAccountToDatabaseRule.account.email,
+        accountType = addAccountToDatabaseRule.account.accountType,
         folder = localFolder.fullName,
         uid = 123,
-        toAddress = toRecipient,
-        ccAddress = ccRecipient
+        toAddresses = toRecipient,
+        ccAddresses = ccRecipient
       ),
       encryptionType = MessageEncryptionType.STANDARD,
       verificationResult = VERIFICATION_RESULT
@@ -126,11 +127,12 @@ class CreateMessageTestRecipientsDuringReplyAllFlowTest : BaseComposeScreenTest(
     val incomingMessageInfo = IncomingMessageInfo(
       localFolder = INBOX,
       msgEntity = MessageEntity(
-        email = addAccountToDatabaseRule.account.email,
+        account = addAccountToDatabaseRule.account.email,
+        accountType = addAccountToDatabaseRule.account.accountType,
         folder = INBOX.fullName,
         uid = 123,
-        replyTo = replyToRecipient,
-        toAddress = listOf(to1Recipient, to2Recipient).joinToString()
+        replyToAddresses = replyToRecipient,
+        toAddresses = listOf(to1Recipient, to2Recipient).joinToString()
       ),
       encryptionType = MessageEncryptionType.STANDARD,
       verificationResult = VERIFICATION_RESULT
@@ -164,11 +166,12 @@ class CreateMessageTestRecipientsDuringReplyAllFlowTest : BaseComposeScreenTest(
     val incomingMessageInfo = IncomingMessageInfo(
       localFolder = INBOX,
       msgEntity = MessageEntity(
-        email = addAccountToDatabaseRule.account.email,
+        account = addAccountToDatabaseRule.account.email,
+        accountType = addAccountToDatabaseRule.account.accountType,
         folder = INBOX.fullName,
         uid = 123,
-        replyTo = replyToRecipient,
-        toAddress = listOf(to1Recipient, to2Recipient, ALIAS).joinToString()
+        replyToAddresses = replyToRecipient,
+        toAddresses = listOf(to1Recipient, to2Recipient, ALIAS).joinToString()
       ),
       encryptionType = MessageEncryptionType.STANDARD,
       verificationResult = VERIFICATION_RESULT
@@ -206,12 +209,13 @@ class CreateMessageTestRecipientsDuringReplyAllFlowTest : BaseComposeScreenTest(
     val incomingMessageInfo = IncomingMessageInfo(
       localFolder = INBOX,
       msgEntity = MessageEntity(
-        email = addAccountToDatabaseRule.account.email,
+        account = addAccountToDatabaseRule.account.email,
+        accountType = addAccountToDatabaseRule.account.accountType,
         folder = INBOX.fullName,
         uid = 123,
-        replyTo = replyToRecipient,
-        toAddress = listOf(to1Recipient, to2Recipient).joinToString(),
-        ccAddress = listOf(ALIAS).joinToString()
+        replyToAddresses = replyToRecipient,
+        toAddresses = listOf(to1Recipient, to2Recipient).joinToString(),
+        ccAddresses = listOf(ALIAS).joinToString()
       ),
       encryptionType = MessageEncryptionType.STANDARD,
       verificationResult = VERIFICATION_RESULT
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectCreatingAndUpdatingFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectCreatingAndUpdatingFlowTest.kt
index 888b296766..b5c9244710 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectCreatingAndUpdatingFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectCreatingAndUpdatingFlowTest.kt
@@ -38,6 +38,7 @@ import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
 import org.hamcrest.CoreMatchers.allOf
 import org.junit.Assert.assertEquals
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -50,6 +51,7 @@ import java.net.HttpURLConnection
  */
 @MediumTest
 @RunWith(AndroidJUnit4::class)
+@Ignore("Should be re-looked after threads will be completed")
 class DraftsGmailAPITestCorrectCreatingAndUpdatingFlowTest : BaseDraftsGmailAPIFlowTest() {
   override val mockWebServerRule =
     FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() {
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectDeletingFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectDeletingFlowTest.kt
index f937a2ebce..b9b05cfbfe 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectDeletingFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectDeletingFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -53,6 +53,7 @@ import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
 import org.junit.Assert.assertEquals
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -71,6 +72,7 @@ import java.util.concurrent.TimeUnit
 @MediumTest
 @RunWith(AndroidJUnit4::class)
 @FlowCryptTestSettings(useCommonIdling = false)
+@Ignore("Should be re-looked after threads will be completed")
 class DraftsGmailAPITestCorrectDeletingFlowTest : BaseDraftsGmailAPIFlowTest() {
   override val mockWebServerRule: FlowCryptMockWebServerRule = FlowCryptMockWebServerRule(
     TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() {
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectSendingFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectSendingFlowTest.kt
index 7ae04036d7..677ca7c38a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectSendingFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/DraftsGmailAPITestCorrectSendingFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -44,6 +44,7 @@ import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
 import org.junit.Assert.assertEquals
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -59,6 +60,7 @@ import java.util.concurrent.TimeUnit
 @MediumTest
 @RunWith(AndroidJUnit4::class)
 @FlowCryptTestSettings(useCommonIdling = false)
+@Ignore("Should be re-looked after threads will be completed")
 class DraftsGmailAPITestCorrectSendingFlowTest : BaseDraftsGmailAPIFlowTest() {
   private val sentCache = mutableListOf<com.google.api.services.gmail.model.Message>()
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsChangeGmailLabelsFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsChangeGmailLabelsFlowTest.kt
index cbfbc5e52e..1542c1f885 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsChangeGmailLabelsFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsChangeGmailLabelsFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -8,6 +8,7 @@ package com.flowcrypt.email.ui
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
@@ -109,9 +110,8 @@ class MessageDetailsChangeGmailLabelsFlowTest : BaseGmailLabelsFlowTest() {
     onView(withId(R.id.recyclerViewLabels))
       .perform(RecyclerViewActions.actionOnItemAtPosition<ViewHolder>(0, click()))
 
-    onView(withText(R.string.cancel))
-      .inRoot(isDialog())
-      .perform(click())
+    //close dialog
+    pressBack()
 
     //open dialog from the Action Bar menu
     openActionBarOverflowOrOptionsMenu(getTargetContext())
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsEkmFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsEkmFlowTest.kt
index eb3819a9ae..96a56c66ad 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsEkmFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsEkmFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -166,7 +166,9 @@ class MessageDetailsEkmFlowTest : BaseMessageDetailsFlowTest() {
       path = "messages/info/encrypted_msg_info_text_with_missing_key.json",
       mimeMsgPath = "messages/mime/encrypted_msg_info_text_with_missing_key.txt",
       accountEntity = addAccountToDatabaseRule.accountEntityWithDecryptedInfo
-    )?.msgEntity
+    ) {
+      it?.copy(msgEntity = it.msgEntity.copy(accountType = AccountEntity.ACCOUNT_TYPE_GOOGLE))
+    }?.msgEntity
     launchActivity(requireNotNull(details))
 
     waitForObjectWithText(getResString(R.string.your_keys_cannot_open_this_message), 2000)
@@ -186,7 +188,9 @@ class MessageDetailsEkmFlowTest : BaseMessageDetailsFlowTest() {
         path = "messages/info/standard_msg_info_plaintext_with_one_att.json",
         mimeMsgPath = "messages/mime/standard_msg_info_plaintext_with_one_att.txt", simpleAttInfo,
         accountEntity = addAccountToDatabaseRule.accountEntityWithDecryptedInfo
-      ), att = simpleAttInfo
+      ) {
+        it?.copy(msgEntity = it.msgEntity.copy(accountType = AccountEntity.ACCOUNT_TYPE_GOOGLE))
+      }, att = simpleAttInfo
     )
 
     onView(withId(R.id.imageButtonPreviewAtt))
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt
index 50e6f66ade..e444a60076 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/MessageDetailsFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -55,6 +55,7 @@ import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.PublicKeyMsgBlock
 import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withEmptyRecyclerView
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withMessageHeaderInfo
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withRecyclerViewItemCount
 import com.flowcrypt.email.model.KeyImportDetails
 import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
@@ -64,7 +65,7 @@ import com.flowcrypt.email.rules.RetryRule
 import com.flowcrypt.email.rules.ScreenshotTestRule
 import com.flowcrypt.email.security.pgp.PgpKey
 import com.flowcrypt.email.ui.activity.CreateMessageActivity
-import com.flowcrypt.email.ui.adapter.MsgDetailsRecyclerViewAdapter
+import com.flowcrypt.email.ui.adapter.MessageHeadersListAdapter
 import com.flowcrypt.email.ui.adapter.PgpBadgeListAdapter
 import com.flowcrypt.email.ui.base.BaseMessageDetailsFlowTest
 import com.flowcrypt.email.util.GeneralUtil
@@ -83,7 +84,6 @@ import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -130,7 +130,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
   @Test
   fun testReplyButton() {
     val incomingMessageInfo = testStandardMsgPlaintextInternal()
-    onView(withId(R.id.layoutReplyButton))
+    onView(withId(R.id.replyButton))
       .check(matches(isDisplayed()))
       .perform(scrollTo(), click())
     intended(hasComponent(CreateMessageActivity::class.java.name))
@@ -147,7 +147,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
   @Test
   fun testReplyAllButton() {
     val incomingMessageInfo = testStandardMsgPlaintextInternal()
-    onView(withId(R.id.layoutReplyAllButton))
+    onView(withId(R.id.replyAllButton))
       .check(matches(isDisplayed()))
       .perform(scrollTo(), click())
     intended(hasComponent(CreateMessageActivity::class.java.name))
@@ -158,7 +158,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
   @Test
   fun testFwdButton() {
     testStandardMsgPlaintextInternal()
-    onView(withId(R.id.layoutFwdButton))
+    onView(withId(R.id.forwardButton))
       .check(matches(isDisplayed()))
       .perform(scrollTo(), click())
     intended(hasComponent(CreateMessageActivity::class.java.name))
@@ -557,8 +557,8 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
     onView(withId(R.id.rVMsgDetails))
       .perform(
         scrollToHolder(
-          withHeaderInfo(
-            MsgDetailsRecyclerViewAdapter.Header(
+          withMessageHeaderInfo(
+            MessageHeadersListAdapter.Header(
               name = getResString(R.string.from),
               value = "Denis Bondarenko <denbond7@flowcrypt.test>"
             )
@@ -568,8 +568,8 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
     onView(withId(R.id.rVMsgDetails))
       .perform(
         scrollToHolder(
-          withHeaderInfo(
-            MsgDetailsRecyclerViewAdapter.Header(
+          withMessageHeaderInfo(
+            MessageHeadersListAdapter.Header(
               name = getResString(R.string.reply_to),
               value = "Denis Bondarenko <denbond7@flowcrypt.test>"
             )
@@ -579,8 +579,8 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
     onView(withId(R.id.rVMsgDetails))
       .perform(
         scrollToHolder(
-          withHeaderInfo(
-            MsgDetailsRecyclerViewAdapter.Header(
+          withMessageHeaderInfo(
+            MessageHeadersListAdapter.Header(
               name = getResString(R.string.to),
               value = "default@flowcrypt.test"
             )
@@ -590,8 +590,8 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
     onView(withId(R.id.rVMsgDetails))
       .perform(
         scrollToHolder(
-          withHeaderInfo(
-            MsgDetailsRecyclerViewAdapter.Header(
+          withMessageHeaderInfo(
+            MessageHeadersListAdapter.Header(
               name = getResString(R.string.cc),
               value = "ccuser@test"
             )
@@ -609,8 +609,8 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
     onView(withId(R.id.rVMsgDetails))
       .perform(
         scrollToHolder(
-          withHeaderInfo(
-            MsgDetailsRecyclerViewAdapter.Header(
+          withMessageHeaderInfo(
+            MessageHeadersListAdapter.Header(
               name = getResString(R.string.date),
               value = datetime
             )
@@ -1228,7 +1228,7 @@ class MessageDetailsFlowTest : BaseMessageDetailsFlowTest() {
     )
 
     val inlineAttachmentMessageBlock =
-      msgInfo?.msgBlocks?.filterIsInstance(InlineAttMsgBlock::class.java)?.first()
+      msgInfo?.msgBlocks?.filterIsInstance<InlineAttMsgBlock>()?.first()
 
     assertEquals(2, msgInfo?.msgBlocks?.size)
     assertEquals(MsgBlock.Type.PLAIN_HTML, msgInfo?.msgBlocks?.get(0)?.type)
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt
index b4c0caf6a2..b02c653344 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -160,7 +160,8 @@ class PublicKeyDetailsHideArmorMetaFlowTest : BaseTest() {
         setRecipients(Message.RecipientType.TO, arrayOf(InternetAddress("user@flowcrypt.test")))
       }
       val messageEntity = MessageEntity.genMsgEntity(
-        email = addAccountToDatabaseRule.account.email,
+        account = addAccountToDatabaseRule.account.email,
+        accountType = addAccountToDatabaseRule.account.accountType,
         label = JavaEmailConstants.FOLDER_OUTBOX,
         msg = mimeMessage,
         uid = 1,
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailApiSignatureFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailApiSignatureFlowTest.kt
index af8db22dc5..49fc16c3e7 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailApiSignatureFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailApiSignatureFlowTest.kt
@@ -5,6 +5,7 @@
 
 package com.flowcrypt.email.ui.base
 
+import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.action.ViewActions.click
@@ -25,7 +26,7 @@ import java.net.HttpURLConnection
 /**
  * @author Denys Bondarenko
  */
-abstract class BaseComposeGmailApiSignatureFlowTest() :
+abstract class BaseComposeGmailApiSignatureFlowTest :
   BaseComposeGmailFlow(
     accountEntity = BASE_ACCOUNT_ENTITY.copy(useAliasSignatures = true)
   ) {
@@ -78,8 +79,10 @@ abstract class BaseComposeGmailApiSignatureFlowTest() :
       .perform(scrollTo())
       .check(matches(withText("\n\n$SIGNATURE_FOR_MAIN")))
 
+    Espresso.closeSoftKeyboard()
+
     onView(withId(R.id.imageButtonAliases))
-      .perform(click())
+      .perform(scrollTo(), click())
 
     onView(withText(ALIAS_EMAIL))
       .check(matches(isDisplayed()))
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailFlow.kt
index abfe34640b..4b988a41c9 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeGmailFlow.kt
@@ -36,7 +36,6 @@ import com.flowcrypt.email.security.model.PgpKeyRingDetails
 import com.flowcrypt.email.security.pgp.PgpDecryptAndOrVerify
 import com.flowcrypt.email.security.pgp.PgpEncryptAndOrSign
 import com.flowcrypt.email.security.pgp.PgpKey
-import com.flowcrypt.email.ui.DraftsGmailAPITestCorrectSendingFlowTest
 import com.flowcrypt.email.util.FileAndDirectoryUtils
 import com.flowcrypt.email.util.OutgoingMessagesManager
 import com.google.api.client.json.gson.GsonFactory
@@ -122,8 +121,8 @@ abstract class BaseComposeGmailFlow(accountEntity: AccountEntity = BASE_ACCOUNT_
       request.method == "PUT" && request.path == LOCATION_URL -> {
         val message = com.google.api.services.gmail.model.Message().apply {
           factory = GsonFactory.getDefaultInstance()
-          id = DraftsGmailAPITestCorrectSendingFlowTest.MESSAGE_ID_SENT
-          threadId = DraftsGmailAPITestCorrectSendingFlowTest.THREAD_ID_SENT
+          id = MESSAGE_ID_SENT
+          threadId = THREAD_ID_SENT
           labelIds = listOf(JavaEmailConstants.FOLDER_SENT)
           raw = request.body.inputStream().readText()
         }
@@ -499,9 +498,7 @@ abstract class BaseComposeGmailFlow(accountEntity: AccountEntity = BASE_ACCOUNT_
       return
     }
 
-    if (outgoingMessageConfiguration.timeoutBeforeMovingToComposeInMilliseconds > 0) {
-      Thread.sleep(outgoingMessageConfiguration.timeoutBeforeMovingToComposeInMilliseconds)
-    }
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //open the compose screen
     onView(withId(R.id.floatActionButtonCompose))
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeScreenTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeScreenTest.kt
index e88823b7bf..f93772eb34 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeScreenTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseComposeScreenTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.base
@@ -38,6 +38,7 @@ import com.flowcrypt.email.util.TestGeneralUtil
 import jakarta.mail.internet.InternetAddress
 import org.hamcrest.Matchers.allOf
 import java.io.File
+import java.util.concurrent.TimeUnit
 
 /**
  * @author Denys Bondarenko
@@ -132,7 +133,10 @@ abstract class BaseComposeScreenTest : BaseTest() {
       )
   }
 
-  protected fun addAttachment(att: File) {
+  protected fun addAttachment(
+    att: File,
+    waitingTimeoutInMilliseconds: Long = TimeUnit.SECONDS.toMillis(10)
+  ) {
     val intent = TestGeneralUtil.genIntentWithPersistedReadPermissionForFile(att)
     intending(
       allOf(
@@ -143,6 +147,7 @@ abstract class BaseComposeScreenTest : BaseTest() {
     onView(withId(R.id.menuActionAttachFile))
       .check(matches(isDisplayed()))
       .perform(click())
+    waitForObjectWithText(att.name, waitingTimeoutInMilliseconds)
   }
 
   companion object{
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseDraftsGmailAPIFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseDraftsGmailAPIFlowTest.kt
index 8921c79190..5ea866ae2f 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseDraftsGmailAPIFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseDraftsGmailAPIFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.base
@@ -473,7 +473,7 @@ abstract class BaseDraftsGmailAPIFlowTest : BaseComposeScreenTest() {
 
     const val DRAFT_ID_SECOND = "r5555555555555555552"
     const val MESSAGE_ID_SECOND = "5555555555555552"
-    const val THREAD_ID_SECOND = "11111111111111112"
+    const val THREAD_ID_SECOND = "1111111111111112"
     const val MESSAGE_SUBJECT_SECOND = "second"
   }
 }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailApiTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailApiTest.kt
index f9105fd7ff..7134b7e76d 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailApiTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailApiTest.kt
@@ -17,6 +17,7 @@ import com.flowcrypt.email.api.retrofit.response.api.EkmPrivateKeysResponse
 import com.flowcrypt.email.api.retrofit.response.model.ClientConfiguration
 import com.flowcrypt.email.api.retrofit.response.model.Key
 import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.extensions.kotlin.asInternetAddress
 import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.toPgpKeyRingDetails
 import com.flowcrypt.email.rules.AddAccountToDatabaseRule
 import com.flowcrypt.email.rules.AddLabelsToDatabaseRule
@@ -29,14 +30,19 @@ import com.flowcrypt.email.util.AccountDaoManager
 import com.flowcrypt.email.util.TestGeneralUtil
 import com.google.api.client.json.Json
 import com.google.api.client.json.gson.GsonFactory
+import com.google.api.services.gmail.model.BatchDeleteMessagesRequest
 import com.google.api.services.gmail.model.BatchModifyMessagesRequest
+import com.google.api.services.gmail.model.Draft
 import com.google.api.services.gmail.model.Label
+import com.google.api.services.gmail.model.ListDraftsResponse
 import com.google.api.services.gmail.model.ListLabelsResponse
 import com.google.api.services.gmail.model.ListMessagesResponse
 import com.google.api.services.gmail.model.ListSendAsResponse
+import com.google.api.services.gmail.model.ListThreadsResponse
 import com.google.api.services.gmail.model.MessagePart
 import com.google.api.services.gmail.model.MessagePartBody
 import com.google.api.services.gmail.model.MessagePartHeader
+import com.google.api.services.gmail.model.Thread
 import jakarta.activation.DataHandler
 import jakarta.activation.DataSource
 import jakarta.mail.Message
@@ -133,27 +139,26 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
   protected open fun handleCommonAPICalls(request: RecordedRequest): MockResponse {
     return when {
       request.path?.startsWith("/attester/pub", ignoreCase = true) == true -> {
-        val lastSegment = request.requestUrl?.pathSegments?.lastOrNull()
+        val lastSegment = request.requestUrl?.pathSegments?.lastOrNull()?.lowercase()
+        val mapOfPublicKeysBasedOnRecipient = mapOf(
+          requireNotNull(DEFAULT_FROM_RECIPIENT.asInternetAddress()?.address)
+              to defaultFromPgpKeyDetails.publicKey,
+          requireNotNull(DEFAULT_TO_RECIPIENT.asInternetAddress()?.address)
+              to defaultToPgpKeyDetails.publicKey,
+          requireNotNull(DEFAULT_CC_RECIPIENT.asInternetAddress()?.address)
+              to defaultCcPgpKeyDetails.publicKey,
+          requireNotNull(DEFAULT_BCC_RECIPIENT.asInternetAddress()?.address)
+              to defaultBccPgpKeyDetails.publicKey,
+          requireNotNull(EXISTING_MESSAGE_CC_RECIPIENT.asInternetAddress()?.address)
+              to existingCcPgpKeyDetails.publicKey,
+        )
 
         return when {
-          lastSegment?.lowercase() in arrayOf(
-            DEFAULT_FROM_RECIPIENT,
-            DEFAULT_TO_RECIPIENT,
-            DEFAULT_CC_RECIPIENT,
-            DEFAULT_BCC_RECIPIENT,
-            EXISTING_MESSAGE_CC_RECIPIENT,
-          ) -> {
+          lastSegment in mapOfPublicKeysBasedOnRecipient.keys -> {
             MockResponse()
               .setResponseCode(HttpURLConnection.HTTP_OK)
               .setBody(
-                when (lastSegment?.lowercase()) {
-                  DEFAULT_FROM_RECIPIENT -> defaultFromPgpKeyDetails.publicKey
-                  DEFAULT_TO_RECIPIENT -> defaultToPgpKeyDetails.publicKey
-                  DEFAULT_CC_RECIPIENT -> defaultCcPgpKeyDetails.publicKey
-                  DEFAULT_BCC_RECIPIENT -> defaultBccPgpKeyDetails.publicKey
-                  EXISTING_MESSAGE_CC_RECIPIENT -> existingCcPgpKeyDetails.publicKey
-                  else -> ""
-                }
+                mapOfPublicKeysBasedOnRecipient.getOrDefault(lastSegment, "")
               )
           }
 
@@ -197,46 +202,24 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
         )
       }
 
-      request.method == "GET" && request.path == genPathForMessageWithSomeFilds(
-        MESSAGE_ID_EXISTING_STANDARD
-      ) -> {
-        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-          .setHeader("Content-Type", Json.MEDIA_TYPE)
-          .setBody(genExistingStandardMessage())
+      request.path == "/gmail/v1/users/me/threads?labelIds=${JavaEmailConstants.FOLDER_INBOX}&maxResults=45" -> {
+        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK).setBody(
+          LIST_THREADS_RESPONSE_ALL_THREADS.toString()
+        )
       }
 
-      request.method == "GET" && request.path == genPathForMessageWithSomeFilds(
-        MESSAGE_ID_EXISTING_ENCRYPTED
-      ) -> {
-        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-          .setHeader("Content-Type", Json.MEDIA_TYPE)
-          .setBody(genExistingEncryptedMessage())
+      request.method == "GET" && request.path?.matches(
+        REGEX_USER_MESSAGES_GET_WITH_FIELDS_FORMAT_FULL
+      ) == true -> {
+        genUserMessagesGetWithFieldsFormatFullResponse(request.path ?: "")
       }
 
-      request.method == "GET" && request.path == genPathForMessageWithSomeFilds(
-        MESSAGE_ID_EXISTING_PGP_MIME
-      ) -> {
-        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-          .setHeader("Content-Type", Json.MEDIA_TYPE)
-          .setBody(genExistingPGPMimeMessage())
+      request.method == "GET" && request.path?.matches(REGEX_USER_MESSAGES_GET_FORMAT_FULL) == true -> {
+        genUserMessagesGetFormatFullResponse(request.path ?: "")
       }
 
-      request.method == "GET" && request.path == "/gmail/v1/users/me/messages/${MESSAGE_ID_EXISTING_STANDARD}?format=full" -> {
-        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-          .setHeader("Content-Type", Json.MEDIA_TYPE)
-          .setBody(genExistingStandardMessage(isFullFormat = true))
-      }
-
-      request.method == "GET" && request.path == "/gmail/v1/users/me/messages/${MESSAGE_ID_EXISTING_ENCRYPTED}?format=full" -> {
-        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-          .setHeader("Content-Type", Json.MEDIA_TYPE)
-          .setBody(genExistingEncryptedMessage(isFullFormat = true))
-      }
-
-      request.method == "GET" && request.path == "/gmail/v1/users/me/messages/${MESSAGE_ID_EXISTING_PGP_MIME}?format=full" -> {
-        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-          .setHeader("Content-Type", Json.MEDIA_TYPE)
-          .setBody(genExistingPGPMimeMessage(isFullFormat = true))
+      request.method == "GET" && request.path?.matches(REGEX_USER_THREADS_GET_FORMAT_FULL) == true -> {
+        genUserThreadsGetFormatFullResponse(request.path ?: "")
       }
 
       request.method == "GET" && request.path == "/gmail/v1/users/me/messages/${MESSAGE_ID_EXISTING_STANDARD}?format=minimal" -> {
@@ -273,9 +256,23 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
           )
       }
 
-      request.method == "GET" && request.path == genPathToGetAttachment(
-        MESSAGE_ID_EXISTING_STANDARD,
-        ATTACHMENT_FIRST_OF_EXISTING_STANDARD
+      request.method == "GET" && request.path in listOf(
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_EXISTING_STANDARD,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_STANDARD
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_1,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_STANDARD
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_2,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_STANDARD
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_STANDARD
+        ),
       ) -> {
         MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
           .setHeader("Content-Type", Json.MEDIA_TYPE)
@@ -287,9 +284,31 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
           )
       }
 
-      request.method == "GET" && request.path == genPathToGetAttachment(
-        MESSAGE_ID_EXISTING_ENCRYPTED,
-        ATTACHMENT_FIRST_OF_EXISTING_ENCRYPTED
+      request.method == "GET" && request.path in listOf(
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_EXISTING_ENCRYPTED,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_ENCRYPTED
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_ENCRYPTED
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_ENCRYPTED
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_2,
+          attachmentId = ATTACHMENT_FIRST_OF_EXISTING_ENCRYPTED
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_2,
+          attachmentId = ATTACHMENT_SECOND_OF_EXISTING_ENCRYPTED
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2,
+          attachmentId = ATTACHMENT_SECOND_OF_EXISTING_ENCRYPTED
+        ),
       ) -> {
         MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
           .setHeader("Content-Type", Json.MEDIA_TYPE)
@@ -317,9 +336,15 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
           )
       }
 
-      request.method == "GET" && request.path == genPathToGetAttachment(
-        MESSAGE_ID_EXISTING_ENCRYPTED,
-        ATTACHMENT_SECOND_OF_EXISTING_ENCRYPTED
+      request.method == "GET" && request.path in listOf(
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_EXISTING_ENCRYPTED,
+          attachmentId = ATTACHMENT_SECOND_OF_EXISTING_ENCRYPTED
+        ),
+        genPathToGetAttachment(
+          messageId = MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE,
+          attachmentId = ATTACHMENT_SECOND_OF_EXISTING_ENCRYPTED
+        ),
       ) -> {
         MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
           .setHeader("Content-Type", Json.MEDIA_TYPE)
@@ -348,10 +373,44 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
           BatchModifyMessagesRequest::class.java
         )
 
-        if (batchModifyMessagesRequest.ids.contains(MESSAGE_ID_EXISTING_STANDARD)
-          || batchModifyMessagesRequest.ids.contains(MESSAGE_ID_EXISTING_ENCRYPTED)
-          || batchModifyMessagesRequest.ids.contains(MESSAGE_ID_EXISTING_PGP_MIME)
-        ) {
+        val handledIds = arrayOf(
+          MESSAGE_ID_EXISTING_STANDARD,
+          MESSAGE_ID_EXISTING_ENCRYPTED,
+          MESSAGE_ID_EXISTING_PGP_MIME,
+          MESSAGE_ID_THREAD_ONLY_STANDARD_1,
+          MESSAGE_ID_THREAD_ONLY_STANDARD_2,
+          MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE,
+          MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE,
+          MESSAGE_ID_THREAD_ONLY_ENCRYPTED_1,
+          MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2,
+          MESSAGE_ID_THREAD_MIXED_MESSAGES_1,
+          MESSAGE_ID_THREAD_MIXED_MESSAGES_2,
+          MESSAGE_ID_THREAD_NO_ATTACHMENTS_1,
+          MESSAGE_ID_THREAD_NO_ATTACHMENTS_2,
+          MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_1,
+          MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_2,
+          MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3,
+        )
+
+        if (handledIds.any { batchModifyMessagesRequest.ids.contains(it) }) {
+          MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
+        } else {
+          MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
+        }
+      }
+
+      request.method == "POST" && request.path == "/gmail/v1/users/me/messages/batchDelete" -> {
+        val source = GzipSource(request.body)
+        val batchDeleteMessagesRequest = GsonFactory.getDefaultInstance().fromInputStream(
+          source.buffer().inputStream(),
+          BatchDeleteMessagesRequest::class.java
+        )
+
+        val handledIds = arrayOf(
+          MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3,
+        )
+
+        if (handledIds.any { batchDeleteMessagesRequest.ids.contains(it) }) {
           MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
         } else {
           MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
@@ -437,11 +496,380 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
           .setBody(content)
       }
 
+      request.method == "GET" && request.path == "/gmail/v1/users/me/drafts?fields=drafts/id,drafts/message/id&q=rfc822msgid:$MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3" -> {
+        MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
+          .setHeader("Content-Type", Json.MEDIA_TYPE)
+          .setBody(
+            ListDraftsResponse().apply {
+              factory = GsonFactory.getDefaultInstance()
+              drafts = listOf(
+                Draft().apply {
+                  id = DRAFT_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3
+                  message = com.google.api.services.gmail.model.Message().apply {
+                    id = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3
+                  }
+                }
+              )
+            }.toString()
+          )
+      }
+
+      else -> MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
+    }
+  }
+
+  private fun genUserMessagesGetWithFieldsFormatFullResponse(path: String): MockResponse {
+    val messageId =
+      REGEX_USER_MESSAGES_GET_WITH_FIELDS_FORMAT_FULL.find(path)?.groups?.get(1)?.value?.trim()
+    val baseResponse = MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
+      .setHeader("Content-Type", Json.MEDIA_TYPE)
+
+    return when (messageId) {
+      MESSAGE_ID_THREAD_ONLY_STANDARD_1 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_ONLY_STANDARD,
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_1,
+          includeBinaryAttachment = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONLY_STANDARD_2 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_ONLY_STANDARD,
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_2,
+          subject = "Re: $SUBJECT_EXISTING_STANDARD",
+          includeBinaryAttachment = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONLY_ENCRYPTED_1 -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_ONLY_ENCRYPTED,
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_1
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2 -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_ONLY_ENCRYPTED,
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2,
+          subject = "Re: $SUBJECT_EXISTING_ENCRYPTED",
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_NO_ATTACHMENTS_1 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_NO_ATTACHMENTS,
+          messageId = MESSAGE_ID_THREAD_NO_ATTACHMENTS_1,
+          subject = SUBJECT_NO_ATTACHMENTS,
+          includeAttachments = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_NO_ATTACHMENTS_2 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_NO_ATTACHMENTS,
+          messageId = MESSAGE_ID_THREAD_NO_ATTACHMENTS_2,
+          subject = "Re: $SUBJECT_NO_ATTACHMENTS",
+          includeAttachments = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_SINGLE_STANDARD_MESSAGE,
+          messageId = MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE,
+          subject = SUBJECT_SINGLE_STANDARD,
+          includeBinaryAttachment = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_SINGLE_ENCRYPTED_MESSAGE,
+          messageId = MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE,
+          subject = SUBJECT_SINGLE_ENCRYPTED
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_1,
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_2,
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+          messageId = messageId,
+          subject = when (messageId) {
+            MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_1 -> SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT
+            else -> "Re: $SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT"
+          },
+          labels = when (messageId) {
+            MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3 -> listOf(JavaEmailConstants.FOLDER_DRAFT)
+            else -> listOf(JavaEmailConstants.FOLDER_INBOX)
+          },
+          includeAttachments = when (messageId) {
+            MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3 -> false
+            else -> true
+          },
+          includeBinaryAttachment = false,
+          from = when (messageId) {
+            MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3 -> addAccountToDatabaseRule.account.email
+            else -> DEFAULT_FROM_RECIPIENT
+          }
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_1,
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_2,
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_3,
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_4 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS,
+          messageId = messageId,
+          subject = when (messageId) {
+            MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_1 -> SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT
+            else -> "Re: $SUBJECT_FEW_MESSAGES_WITH_FEW_DRAFTS"
+          },
+          labels = when (messageId) {
+            MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_3,
+            MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_4 -> listOf(JavaEmailConstants.FOLDER_DRAFT)
+
+            else -> listOf(JavaEmailConstants.FOLDER_INBOX)
+          },
+          includeBinaryAttachment = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_1,
+      MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_2,
+      MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_3 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS,
+          messageId = messageId,
+          subject = when (messageId) {
+            MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_1 -> SUBJECT_ONE_MESSAGE_WITH_FEW_DRAFTS
+            else -> "Re: $SUBJECT_ONE_MESSAGE_WITH_FEW_DRAFTS"
+          },
+          labels = when (messageId) {
+            MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_2,
+            MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_3 -> listOf(JavaEmailConstants.FOLDER_DRAFT)
+
+            else -> listOf(JavaEmailConstants.FOLDER_INBOX)
+          },
+          includeBinaryAttachment = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_MIXED_MESSAGES_1 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_MIXED_MESSAGES,
+          messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_1,
+          subject = SUBJECT_MIXED_MESSAGES,
+          includeAttachments = false
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_MIXED_MESSAGES_2 -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_MIXED_MESSAGES,
+          messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_2,
+          subject = "Re: $SUBJECT_MIXED_MESSAGES"
+        ).toString()
+      )
+
+      MESSAGE_ID_EXISTING_STANDARD -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_EXISTING_STANDARD,
+          messageId = MESSAGE_ID_EXISTING_STANDARD
+        ).toString()
+      )
+
+      MESSAGE_ID_EXISTING_ENCRYPTED -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_EXISTING_ENCRYPTED,
+          messageId = MESSAGE_ID_EXISTING_ENCRYPTED
+        ).toString()
+      )
+
+      MESSAGE_ID_EXISTING_PGP_MIME -> baseResponse.setBody(genPGPMimeMessage())
+
       else -> MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
     }
   }
 
-  private fun genPathForMessageWithSomeFilds(messageId: String) =
+  private fun genUserMessagesGetFormatFullResponse(path: String): MockResponse {
+    val messageId = REGEX_USER_MESSAGES_GET_FORMAT_FULL.find(path)?.groups?.get(1)?.value?.trim()
+    val baseResponse = MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
+      .setHeader("Content-Type", Json.MEDIA_TYPE)
+
+    return when (messageId) {
+      MESSAGE_ID_EXISTING_STANDARD -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_EXISTING_STANDARD,
+          messageId = MESSAGE_ID_EXISTING_STANDARD,
+          isFullFormat = true,
+        ).toString()
+      )
+
+      MESSAGE_ID_EXISTING_ENCRYPTED -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_EXISTING_ENCRYPTED,
+          messageId = MESSAGE_ID_EXISTING_ENCRYPTED,
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_EXISTING_PGP_MIME -> baseResponse.setBody(
+        genPGPMimeMessage(isFullFormat = true)
+      )
+
+      MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_SINGLE_STANDARD_MESSAGE,
+          messageId = MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE,
+          subject = SUBJECT_SINGLE_STANDARD,
+          includeBinaryAttachment = false,
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_SINGLE_ENCRYPTED_MESSAGE,
+          messageId = MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE,
+          subject = SUBJECT_SINGLE_ENCRYPTED,
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONLY_STANDARD_1 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_ONLY_STANDARD,
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_1,
+          includeBinaryAttachment = false,
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONLY_STANDARD_2 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_ONLY_STANDARD,
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_2,
+          subject = "Re: $SUBJECT_EXISTING_STANDARD",
+          includeBinaryAttachment = false,
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONLY_ENCRYPTED_1 -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_ONLY_ENCRYPTED,
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_1,
+          subject = SUBJECT_EXISTING_ENCRYPTED,
+          isFullFormat = true,
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2 -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_ONLY_ENCRYPTED,
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2,
+          subject = "Re: $SUBJECT_EXISTING_ENCRYPTED",
+          isFullFormat = true,
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_MIXED_MESSAGES_1 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_MIXED_MESSAGES,
+          messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_1,
+          subject = SUBJECT_MIXED_MESSAGES,
+          includeAttachments = false,
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_MIXED_MESSAGES_2 -> baseResponse.setBody(
+        genEncryptedMessage(
+          threadId = THREAD_ID_MIXED_MESSAGES,
+          messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_2,
+          subject = "Re: $SUBJECT_MIXED_MESSAGES",
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_NO_ATTACHMENTS_2 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_NO_ATTACHMENTS,
+          messageId = MESSAGE_ID_THREAD_NO_ATTACHMENTS_2,
+          subject = "Re: $SUBJECT_NO_ATTACHMENTS",
+          includeAttachments = false,
+          isFullFormat = true
+        ).toString()
+      )
+
+      MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3 -> baseResponse.setBody(
+        genStandardMessage(
+          threadId = THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+          messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3,
+          subject = "Re: $SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT",
+          includeAttachments = false,
+          isFullFormat = true,
+          labels = listOf(JavaEmailConstants.FOLDER_DRAFT),
+          from = addAccountToDatabaseRule.account.email
+        ).toString()
+      )
+
+      else -> MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
+    }
+  }
+
+  private fun genUserThreadsGetFormatFullResponse(path: String): MockResponse {
+    val threadId = REGEX_USER_THREADS_GET_FORMAT_FULL.find(path)?.groups?.get(1)?.value?.trim()
+    val baseResponse = MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
+      .setHeader("Content-Type", Json.MEDIA_TYPE)
+
+    return when (threadId) {
+      THREAD_ID_ONLY_STANDARD -> baseResponse.setBody(
+        genThreadWithOnlyStandardMessages()
+      )
+
+      THREAD_ID_ONLY_ENCRYPTED -> baseResponse.setBody(
+        genThreadWithOnlyEncryptedMessages()
+      )
+
+      THREAD_ID_NO_ATTACHMENTS -> baseResponse.setBody(
+        genThreadWithNoAttachments()
+      )
+
+      THREAD_ID_SINGLE_STANDARD_MESSAGE -> baseResponse.setBody(
+        genThreadWithSingleStandardMessage()
+      )
+
+      THREAD_ID_SINGLE_ENCRYPTED_MESSAGE -> baseResponse.setBody(
+        genThreadWithSingleEncryptedMessage()
+      )
+
+      THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT -> baseResponse.setBody(
+        genThreadWithFewMessagesAndSingleDraft()
+      )
+
+      THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS -> baseResponse.setBody(
+        genThreadWithFewMessagesFewDrafts()
+      )
+
+      THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS -> baseResponse.setBody(
+        genThreadWithOneMessageFewDrafts()
+      )
+
+      THREAD_ID_MIXED_MESSAGES -> baseResponse.setBody(
+        genThreadWithMixedMessages()
+      )
+
+      else -> MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
+    }
+  }
+
+  private fun genPathForMessageWithSomeFields(messageId: String) =
     "/gmail/v1/users/me/messages/$messageId?fields=" +
         "id," +
         "threadId," +
@@ -462,20 +890,241 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     "/gmail/v1/users/me/messages/${messageId}/attachments/${attachmentId}" +
         "?fields=data&prettyPrint=false"
 
-  private fun genExistingStandardMessage(isFullFormat: Boolean = false) =
+  private fun genThreadWithOnlyStandardMessages() =
+    Thread().apply {
+      factory = GsonFactory.getDefaultInstance()
+      id = THREAD_ID_ONLY_STANDARD
+      messages = listOf(
+        genStandardMessage(
+          threadId = THREAD_ID_ONLY_STANDARD,
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_1,
+          isFullFormat = true,
+          includeBinaryAttachment = false
+        ),
+        genStandardMessage(
+          threadId = THREAD_ID_ONLY_STANDARD,
+          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_2,
+          subject = "Re: $SUBJECT_EXISTING_STANDARD",
+          isFullFormat = true,
+          includeBinaryAttachment = false
+        )
+      )
+    }.toString()
+
+  private fun genThreadWithOnlyEncryptedMessages() =
+    Thread().apply {
+      factory = GsonFactory.getDefaultInstance()
+      id = THREAD_ID_ONLY_ENCRYPTED
+      messages = listOf(
+        genEncryptedMessage(
+          threadId = THREAD_ID_ONLY_ENCRYPTED,
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_1,
+          isFullFormat = true
+        ),
+        genEncryptedMessage(
+          threadId = THREAD_ID_ONLY_ENCRYPTED,
+          messageId = MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2,
+          subject = "Re: $SUBJECT_EXISTING_ENCRYPTED",
+          isFullFormat = true
+        )
+      )
+    }.toString()
+
+  private fun genThreadWithNoAttachments() =
+    Thread().apply {
+      factory = GsonFactory.getDefaultInstance()
+      id = THREAD_ID_NO_ATTACHMENTS
+      messages = listOf(
+        genStandardMessage(
+          threadId = THREAD_ID_NO_ATTACHMENTS,
+          messageId = MESSAGE_ID_THREAD_NO_ATTACHMENTS_1,
+          subject = SUBJECT_NO_ATTACHMENTS,
+          isFullFormat = true,
+          includeAttachments = false
+        ),
+        genStandardMessage(
+          threadId = THREAD_ID_NO_ATTACHMENTS,
+          messageId = MESSAGE_ID_THREAD_NO_ATTACHMENTS_2,
+          subject = "Re: $SUBJECT_NO_ATTACHMENTS",
+          isFullFormat = true,
+          includeAttachments = false
+        )
+      )
+    }.toString()
+
+  private fun genThreadWithSingleStandardMessage() = Thread().apply {
+    factory = GsonFactory.getDefaultInstance()
+    id = THREAD_ID_SINGLE_STANDARD_MESSAGE
+    messages = listOf(
+      genStandardMessage(
+        threadId = THREAD_ID_SINGLE_STANDARD_MESSAGE,
+        messageId = MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE,
+        subject = SUBJECT_SINGLE_STANDARD,
+        includeBinaryAttachment = false,
+        isFullFormat = true
+      ),
+    )
+  }.toString()
+
+  private fun genThreadWithSingleEncryptedMessage() = Thread().apply {
+    factory = GsonFactory.getDefaultInstance()
+    id = THREAD_ID_SINGLE_ENCRYPTED_MESSAGE
+    messages = listOf(
+      genEncryptedMessage(
+        threadId = THREAD_ID_SINGLE_ENCRYPTED_MESSAGE,
+        messageId = MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE,
+        subject = SUBJECT_SINGLE_ENCRYPTED,
+        isFullFormat = true
+      ),
+    )
+  }.toString()
+
+  private fun genThreadWithFewMessagesAndSingleDraft() = Thread().apply {
+    factory = GsonFactory.getDefaultInstance()
+    id = THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT
+    messages = listOf(
+      genStandardMessage(
+        threadId = THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+        messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_1,
+        subject = SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+        includeBinaryAttachment = false,
+        isFullFormat = true
+      ),
+      genStandardMessage(
+        threadId = THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+        messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_2,
+        subject = "Re: $SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT",
+        includeBinaryAttachment = false,
+        isFullFormat = true
+      ),
+      genStandardMessage(
+        threadId = THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+        messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3,
+        subject = "Re: $SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT",
+        includeAttachments = false,
+        isFullFormat = true,
+        labels = listOf(JavaEmailConstants.FOLDER_DRAFT),
+        from = addAccountToDatabaseRule.account.email
+      ),
+    )
+  }.toString()
+
+  private fun genThreadWithFewMessagesFewDrafts() = Thread().apply {
+    factory = GsonFactory.getDefaultInstance()
+    id = THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS
+    messages = listOf(
+      genStandardMessage(
+        threadId = THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS,
+        messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_1,
+        subject = SUBJECT_FEW_MESSAGES_WITH_FEW_DRAFTS,
+        includeBinaryAttachment = false,
+        isFullFormat = true
+      ),
+      genStandardMessage(
+        threadId = THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS,
+        messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_2,
+        subject = "Re: $SUBJECT_FEW_MESSAGES_WITH_FEW_DRAFTS",
+        includeBinaryAttachment = false,
+        isFullFormat = true
+      ),
+      genStandardMessage(
+        threadId = THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS,
+        messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_3,
+        subject = "Re: $SUBJECT_FEW_MESSAGES_WITH_FEW_DRAFTS",
+        includeBinaryAttachment = false,
+        isFullFormat = true,
+        labels = listOf(JavaEmailConstants.FOLDER_DRAFT)
+      ),
+      genStandardMessage(
+        threadId = THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS,
+        messageId = MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_4,
+        subject = "Re: $SUBJECT_FEW_MESSAGES_WITH_FEW_DRAFTS",
+        includeBinaryAttachment = false,
+        isFullFormat = true,
+        labels = listOf(JavaEmailConstants.FOLDER_DRAFT)
+      ),
+    )
+  }.toString()
+
+  private fun genThreadWithOneMessageFewDrafts() = Thread().apply {
+    factory = GsonFactory.getDefaultInstance()
+    id = THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS
+    messages = listOf(
+      genStandardMessage(
+        threadId = THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS,
+        messageId = MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_1,
+        subject = SUBJECT_ONE_MESSAGE_WITH_FEW_DRAFTS,
+        includeBinaryAttachment = false,
+        isFullFormat = true
+      ),
+      genStandardMessage(
+        threadId = THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS,
+        messageId = MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_2,
+        subject = "Re: $SUBJECT_ONE_MESSAGE_WITH_FEW_DRAFTS",
+        includeBinaryAttachment = false,
+        isFullFormat = true,
+        labels = listOf(JavaEmailConstants.FOLDER_DRAFT)
+      ),
+      genStandardMessage(
+        threadId = THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS,
+        messageId = MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_3,
+        subject = "Re: $SUBJECT_ONE_MESSAGE_WITH_FEW_DRAFTS",
+        includeBinaryAttachment = false,
+        isFullFormat = true,
+        labels = listOf(JavaEmailConstants.FOLDER_DRAFT)
+      ),
+    )
+  }.toString()
+
+  private fun genThreadWithMixedMessages() = Thread().apply {
+    factory = GsonFactory.getDefaultInstance()
+    id = THREAD_ID_MIXED_MESSAGES
+    messages = listOf(
+      genStandardMessage(
+        threadId = THREAD_ID_MIXED_MESSAGES,
+        messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_1,
+        subject = SUBJECT_MIXED_MESSAGES,
+        includeAttachments = false,
+        isFullFormat = true
+      ),
+      genEncryptedMessage(
+        threadId = THREAD_ID_MIXED_MESSAGES,
+        messageId = MESSAGE_ID_THREAD_MIXED_MESSAGES_2,
+        subject = "Re: $SUBJECT_MIXED_MESSAGES",
+        isFullFormat = true
+      ),
+    )
+  }.toString()
+
+  protected fun genStandardMessage(
+    threadId: String,
+    messageId: String,
+    labels: List<String> = listOf(JavaEmailConstants.FOLDER_INBOX),
+    subject: String = SUBJECT_EXISTING_STANDARD,
+    from: String = DEFAULT_FROM_RECIPIENT,
+    isFullFormat: Boolean = false,
+    includeAttachments: Boolean = true,
+    includeBinaryAttachment: Boolean = true
+  ) =
     com.google.api.services.gmail.model.Message().apply {
       factory = GsonFactory.getDefaultInstance()
-      id = MESSAGE_ID_EXISTING_STANDARD
-      threadId = THREAD_ID_EXISTING_STANDARD
-      labelIds = listOf(JavaEmailConstants.FOLDER_INBOX)
-      snippet = SUBJECT_EXISTING_STANDARD
+      id = messageId
+      this.threadId = threadId
+      labelIds = labels
+      snippet = subject
       historyId = HISTORY_ID_STANDARD
       val boundary = "000000000000fbd8c4060ea7c59b"
       payload = MessagePart().apply {
         partId = ""
         mimeType = "multipart/mixed"
         filename = ""
-        headers = prepareMessageHeaders(SUBJECT_EXISTING_STANDARD, DATE_EXISTING_STANDARD, boundary)
+        headers = prepareMessageHeaders(
+          subject = subject,
+          dateInMilliseconds = DATE_EXISTING_STANDARD,
+          boundary = boundary,
+          messageId = messageId,
+          from = from
+        )
         body = MessagePartBody().apply {
           setSize(0)
         }
@@ -489,7 +1138,7 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
               value = "multipart/alternative; boundary=\\\"000000000000fbd8c2060ea7c59b\\\""
             })
             body = MessagePartBody().apply { setSize(0) }
-            parts = listOf(
+            parts = mutableListOf(
               MessagePart().apply {
                 partId = "0.0"
                 mimeType = "text/plain"
@@ -527,89 +1176,108 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
               }
             )
           },
-          MessagePart().apply {
-            partId = "1"
-            mimeType = "text/plain"
-            filename = ATTACHMENT_NAME_1
-            headers = listOf(
-              MessagePartHeader().apply {
-                name = "Content-Type"
-                value = "text/plain; charset=\\\"US-ASCII\\\"; name=\\\"$ATTACHMENT_NAME_1\\\""
-              },
-              MessagePartHeader().apply {
-                name = "Content-Disposition"
-                value = "attachment; filename=\\\"$ATTACHMENT_NAME_1\\\""
-              },
-              MessagePartHeader().apply {
-                name = "Content-Transfer-Encoding"
-                value = "base64"
-              },
-              MessagePartHeader().apply {
-                name = "Content-ID"
-                value = "f_lr8zar5y0"
-              },
-              MessagePartHeader().apply {
-                name = "X-Attachment-Id"
-                value = "f_lr8zar5y0"
-              },
-            )
-            body = MessagePartBody().apply {
-              attachmentId = ATTACHMENT_FIRST_OF_EXISTING_STANDARD
-              setSize(attachmentsDataCache[0].size)
-            }
-          },
-          MessagePart().apply {
-            partId = "2"
-            mimeType = "image/png"
-            filename = ATTACHMENT_NAME_3
-            headers = listOf(
-              MessagePartHeader().apply {
-                name = "Content-Type"
-                value = "image/png; name=\\\"$ATTACHMENT_NAME_3\\\""
-              },
-              MessagePartHeader().apply {
-                name = "Content-Disposition"
-                value = "attachment; filename=\\\"$ATTACHMENT_NAME_3\\\""
-              },
-              MessagePartHeader().apply {
-                name = "Content-Transfer-Encoding"
-                value = "base64"
-              },
-              MessagePartHeader().apply {
-                name = "Content-ID"
-                value = "f_lr8zar681"
-              },
-              MessagePartHeader().apply {
-                name = "X-Attachment-Id"
-                value = "f_lr8zar681"
-              },
+        ).toMutableList().apply {
+          if (includeAttachments) {
+            add(
+              MessagePart().apply {
+                partId = "1"
+                mimeType = "text/plain"
+                filename = ATTACHMENT_NAME_1
+                headers = listOf(
+                  MessagePartHeader().apply {
+                    name = "Content-Type"
+                    value = "text/plain; charset=\\\"US-ASCII\\\"; name=\\\"$ATTACHMENT_NAME_1\\\""
+                  },
+                  MessagePartHeader().apply {
+                    name = "Content-Disposition"
+                    value = "attachment; filename=\\\"$ATTACHMENT_NAME_1\\\""
+                  },
+                  MessagePartHeader().apply {
+                    name = "Content-Transfer-Encoding"
+                    value = "base64"
+                  },
+                  MessagePartHeader().apply {
+                    name = "Content-ID"
+                    value = "f_lr8zar5y0"
+                  },
+                  MessagePartHeader().apply {
+                    name = "X-Attachment-Id"
+                    value = "f_lr8zar5y0"
+                  },
+                )
+                body = MessagePartBody().apply {
+                  attachmentId = ATTACHMENT_FIRST_OF_EXISTING_STANDARD
+                  setSize(attachmentsDataCache[0].size)
+                }
+              }
             )
-            body = MessagePartBody().apply {
-              attachmentId = ATTACHMENT_SECOND_OF_EXISTING_STANDARD
-              setSize(attachmentsDataCache[2].size)
+
+            if (includeBinaryAttachment) {
+              add(
+                MessagePart().apply {
+                  partId = "2"
+                  mimeType = "application/pgp-keys"
+                  filename = ATTACHMENT_NAME_3
+                  headers = listOf(
+                    MessagePartHeader().apply {
+                      name = "Content-Type"
+                      value = "application/pgp-keys; name=\\\"$ATTACHMENT_NAME_3\\\""
+                    },
+                    MessagePartHeader().apply {
+                      name = "Content-Disposition"
+                      value = "attachment; filename=\\\"$ATTACHMENT_NAME_3\\\""
+                    },
+                    MessagePartHeader().apply {
+                      name = "Content-Transfer-Encoding"
+                      value = "base64"
+                    },
+                    MessagePartHeader().apply {
+                      name = "Content-ID"
+                      value = "f_lr8zar681"
+                    },
+                    MessagePartHeader().apply {
+                      name = "X-Attachment-Id"
+                      value = "f_lr8zar681"
+                    },
+                  )
+                  body = MessagePartBody().apply {
+                    attachmentId = ATTACHMENT_SECOND_OF_EXISTING_STANDARD
+                    setSize(attachmentsDataCache[2].size)
+                  }
+                }
+              )
             }
           }
-        )
+        }
       }
       internalDate = DATE_EXISTING_STANDARD
       sizeEstimate = 0 // we don't care about this parameter
-    }.toString()
+    }
 
-  private fun genExistingEncryptedMessage(isFullFormat: Boolean = false) =
-    com.google.api.services.gmail.model.Message().apply {
+  private fun genEncryptedMessage(
+    threadId: String,
+    messageId: String,
+    labels: List<String> = listOf(JavaEmailConstants.FOLDER_INBOX),
+    subject: String = SUBJECT_EXISTING_ENCRYPTED,
+    isFullFormat: Boolean = false
+  ) = com.google.api.services.gmail.model.Message().apply {
       factory = GsonFactory.getDefaultInstance()
-      id = MESSAGE_ID_EXISTING_ENCRYPTED
-      threadId = THREAD_ID_EXISTING_ENCRYPTED
-      labelIds = listOf(JavaEmailConstants.FOLDER_INBOX)
-      snippet = SUBJECT_EXISTING_ENCRYPTED
+    id = messageId
+    this.threadId = threadId
+    labelIds = labels
+    snippet = subject
       historyId = HISTORY_ID_ENCRYPTED
       val boundary = "000000000000fbd8c4060ea7c69b"
       payload = MessagePart().apply {
         partId = ""
         mimeType = "multipart/mixed"
         filename = ""
-        headers =
-          prepareMessageHeaders(SUBJECT_EXISTING_ENCRYPTED, DATE_EXISTING_ENCRYPTED, boundary)
+        headers = prepareMessageHeaders(
+          subject = subject,
+          dateInMilliseconds = DATE_EXISTING_ENCRYPTED,
+          boundary = boundary,
+          messageId = messageId
+        )
         body = MessagePartBody().apply {
           setSize(0)
         }
@@ -673,7 +1341,7 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
       }
       internalDate = DATE_EXISTING_ENCRYPTED
       sizeEstimate = 0 // we don't care about this parameter
-    }.toString()
+  }
 
   private fun generateHeadersForEncryptedAttachment(fileName: String, id: String) = listOf(
     MessagePartHeader().apply {
@@ -770,7 +1438,11 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
   private fun prepareMessageHeaders(
     subject: String,
     dateInMilliseconds: Long,
-    boundary: String
+    boundary: String,
+    from: String = DEFAULT_FROM_RECIPIENT,
+    to: String = EXISTING_MESSAGE_TO_RECIPIENT,
+    cc: String = EXISTING_MESSAGE_CC_RECIPIENT,
+    messageId: String = EmailUtil.generateContentId()
   ) = listOf(
     MessagePartHeader().apply {
       name = "MIME-Version"
@@ -782,7 +1454,7 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     },
     MessagePartHeader().apply {
       name = "Message-ID"
-      value = EmailUtil.generateContentId()
+      value = messageId
     },
     MessagePartHeader().apply {
       name = "Subject"
@@ -790,15 +1462,15 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     },
     MessagePartHeader().apply {
       name = "From"
-      value = DEFAULT_FROM_RECIPIENT
+      value = from
     },
     MessagePartHeader().apply {
       name = "To"
-      value = EXISTING_MESSAGE_TO_RECIPIENT
+      value = to
     },
     MessagePartHeader().apply {
       name = "Cc"
-      value = EXISTING_MESSAGE_CC_RECIPIENT
+      value = cc
     },
     MessagePartHeader().apply {
       name = "Content-Type"
@@ -806,7 +1478,7 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     },
   )
 
-  private fun genExistingPGPMimeMessage(isFullFormat: Boolean = false) =
+  private fun genPGPMimeMessage(isFullFormat: Boolean = false) =
     com.google.api.services.gmail.model.Message().apply {
       factory = GsonFactory.getDefaultInstance()
       id = MESSAGE_ID_EXISTING_PGP_MIME
@@ -820,9 +1492,10 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
         mimeType = "multipart/encrypted"
         filename = ""
         headers = prepareMessageHeaders(
-          SUBJECT_EXISTING_PGP_MIME,
-          DATE_EXISTING_PGP_MIME,
-          boundary
+          subject = SUBJECT_EXISTING_PGP_MIME,
+          dateInMilliseconds = DATE_EXISTING_PGP_MIME,
+          boundary = boundary,
+          messageId = MESSAGE_ID_EXISTING_PGP_MIME
         ).filterNot {
           it.name == "Content-Type"
         }.toMutableList().apply {
@@ -949,6 +1622,46 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     const val POSITION_EXISTING_STANDARD = 1
     const val POSITION_EXISTING_PGP_MIME = 2
 
+    const val THREAD_ID_ONLY_STANDARD = "200000e222d6c001"
+    const val MESSAGE_ID_THREAD_ONLY_STANDARD_1 = "5555555559991001"
+    const val MESSAGE_ID_THREAD_ONLY_STANDARD_2 = "5555555559991002"
+    const val THREAD_ID_ONLY_ENCRYPTED = "200000e222d6c002"
+    const val MESSAGE_ID_THREAD_ONLY_ENCRYPTED_1 = "5555555559992001"
+    const val MESSAGE_ID_THREAD_ONLY_ENCRYPTED_2 = "5555555559992002"
+    const val THREAD_ID_STANDARD_AND_ENCRYPTED = "200000e222d6c003"
+    const val THREAD_ID_NO_ATTACHMENTS = "200000e222d6c004"
+    const val MESSAGE_ID_THREAD_NO_ATTACHMENTS_1 = "5555555559993001"
+    const val MESSAGE_ID_THREAD_NO_ATTACHMENTS_2 = "5555555559993002"
+    const val THREAD_ID_SINGLE_STANDARD_MESSAGE = "200000e222d6c005"
+    const val MESSAGE_ID_THREAD_SINGLE_STANDARD_MESSAGE = "5555555559995001"
+    const val THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT = "200000e222d6c006"
+    const val MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_1 = "5555555559996001"
+    const val MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_2 = "5555555559996002"
+    const val MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3 = "5555555559996003"
+    const val DRAFT_ID_THREAD_FEW_MESSAGES_WITH_SINGLE_DRAFT_3 = "r565555555559996003"
+    const val THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS = "200000e222d6c007"
+    const val MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_1 = "5555555559997001"
+    const val MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_2 = "5555555559997002"
+    const val MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_3 = "5555555559997003"
+    const val MESSAGE_ID_THREAD_FEW_MESSAGES_WITH_FEW_DRAFTS_4 = "5555555559997004"
+    const val THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS = "200000e222d6c008"
+    const val MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_1 = "5555555559998001"
+    const val MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_2 = "5555555559998002"
+    const val MESSAGE_ID_THREAD_ONE_MESSAGE_WITH_FEW_DRAFTS_3 = "5555555559998003"
+    const val THREAD_ID_SINGLE_ENCRYPTED_MESSAGE = "200000e222d6c009"
+    const val MESSAGE_ID_THREAD_SINGLE_ENCRYPTED_MESSAGE = "5555555559999001"
+    const val THREAD_ID_MIXED_MESSAGES = "200000e222d6c010"
+    const val MESSAGE_ID_THREAD_MIXED_MESSAGES_1 = "5555555559910001"
+    const val MESSAGE_ID_THREAD_MIXED_MESSAGES_2 = "5555555559910002"
+
+    const val SUBJECT_NO_ATTACHMENTS = "No attachments"
+    const val SUBJECT_SINGLE_STANDARD = "Single standard message"
+    const val SUBJECT_SINGLE_ENCRYPTED = "Single encrypted message"
+    const val SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT = "few messages in thread + 1 draft"
+    const val SUBJECT_FEW_MESSAGES_WITH_FEW_DRAFTS = "few messages in thread + few drafts"
+    const val SUBJECT_ONE_MESSAGE_WITH_FEW_DRAFTS = "one message in thread + few drafts"
+    const val SUBJECT_MIXED_MESSAGES = "Mixed messages"
+
     const val MESSAGE_ID_EXISTING_STANDARD = "5555555555555551"
     const val THREAD_ID_EXISTING_STANDARD = "1111111111111111"
     const val DATE_EXISTING_STANDARD = 1704963592000
@@ -958,7 +1671,7 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     const val ATTACHMENT_SECOND_OF_EXISTING_STANDARD = "22222222222222222"
 
     const val MESSAGE_ID_EXISTING_ENCRYPTED = "5555555555555552"
-    const val THREAD_ID_EXISTING_ENCRYPTED = "1111v111111111112"
+    const val THREAD_ID_EXISTING_ENCRYPTED = "1111111111111112"
     const val DATE_EXISTING_ENCRYPTED = 1704963599000
     const val SUBJECT_EXISTING_ENCRYPTED = "Encrypted"
     const val MESSAGE_EXISTING_ENCRYPTED = "Encrypted message"
@@ -966,7 +1679,7 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     const val ATTACHMENT_SECOND_OF_EXISTING_ENCRYPTED = "22222222222222224"
 
     const val MESSAGE_ID_EXISTING_PGP_MIME = "5555555555555553"
-    const val THREAD_ID_EXISTING_PGP_MIME = "1111v111111111113"
+    const val THREAD_ID_EXISTING_PGP_MIME = "1111111111111113"
     const val DATE_EXISTING_PGP_MIME = 1704963581000
     const val SUBJECT_EXISTING_PGP_MIME = "PGP/MIME Encrypted"
     const val MESSAGE_EXISTING_PGP_MIME = "PGP/MIME"
@@ -975,15 +1688,26 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
     val HISTORY_ID_ENCRYPTED = BigInteger("53163327")
     val HISTORY_ID_PGP_MIME = BigInteger("53163027")
 
+    val REGEX_USER_MESSAGES_GET_WITH_FIELDS_FORMAT_FULL =
+      ("/gmail/v1/users/me/messages/(.{16})\\?fields=id," +
+          "threadId,labelIds,snippet,sizeEstimate,historyId,internalDate,payload/partId," +
+          "payload/mimeType,payload/filename,payload/headers,payload/body," +
+          "payload/parts\\(partId,mimeType,filename,headers," +
+          "body/size,body/attachmentId\\)&format=full").toRegex()
+    val REGEX_USER_MESSAGES_GET_FORMAT_FULL =
+      ("/gmail/v1/users/me/messages/(.{16})\\?format=full").toRegex()
+    val REGEX_USER_THREADS_GET_FORMAT_FULL =
+      ("/gmail/v1/users/me/threads/(.{16})\\?format=full").toRegex()
+
     const val ATTACHMENT_NAME_1 = "text.txt"
     const val ATTACHMENT_NAME_2 = "text1.txt"
     const val ATTACHMENT_NAME_3 = "binary_key.key"
     const val ATTACHMENT_PGP_MIME = "encrypted.asc"
 
-    const val DEFAULT_FROM_RECIPIENT = "default_from@flowcrypt.test"
-    const val DEFAULT_TO_RECIPIENT = "default_to@flowcrypt.test"
-    const val DEFAULT_CC_RECIPIENT = "default_cc@flowcrypt.test"
-    const val DEFAULT_BCC_RECIPIENT = "default_bcc@flowcrypt.test"
+    const val DEFAULT_FROM_RECIPIENT = "From <default_from@flowcrypt.test>"
+    const val DEFAULT_TO_RECIPIENT = "To <default_to@flowcrypt.test>"
+    const val DEFAULT_CC_RECIPIENT = "Cc <default_cc@flowcrypt.test>"
+    const val DEFAULT_BCC_RECIPIENT = "Bcc <default_bcc@flowcrypt.test>"
 
     val existingCcPgpKeyDetails = PGPainless.generateKeyRing().simpleEcKeyRing(
       EXISTING_MESSAGE_CC_RECIPIENT,
@@ -1025,6 +1749,21 @@ abstract class BaseGmailApiTest(val accountEntity: AccountEntity = BASE_ACCOUNT_
       )
     }
 
+    val LIST_THREADS_RESPONSE_ALL_THREADS = ListThreadsResponse().apply {
+      factory = GsonFactory.getDefaultInstance()
+      threads = listOf(
+        Thread().apply { id = THREAD_ID_ONLY_STANDARD },
+        Thread().apply { id = THREAD_ID_ONLY_ENCRYPTED },
+        Thread().apply { id = THREAD_ID_NO_ATTACHMENTS },
+        Thread().apply { id = THREAD_ID_SINGLE_STANDARD_MESSAGE },
+        Thread().apply { id = THREAD_ID_SINGLE_ENCRYPTED_MESSAGE },
+        Thread().apply { id = THREAD_ID_FEW_MESSAGES_WITH_SINGLE_DRAFT },
+        Thread().apply { id = THREAD_ID_FEW_MESSAGES_WITH_FEW_DRAFTS },
+        Thread().apply { id = THREAD_ID_ONE_MESSAGE_WITH_FEW_DRAFTS },
+        Thread().apply { id = THREAD_ID_MIXED_MESSAGES },
+      )
+    }
+
     val BASE_ACCOUNT_ENTITY = AccountDaoManager.getDefaultAccountDao().copy(
       accountType = AccountEntity.ACCOUNT_TYPE_GOOGLE, clientConfiguration = ClientConfiguration(
         flags = listOf(
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailLabelsFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailLabelsFlowTest.kt
index 5b7ae691ca..4bd2fade7b 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailLabelsFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseGmailLabelsFlowTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.base
@@ -91,7 +91,8 @@ abstract class BaseGmailLabelsFlowTest : BaseMessageDetailsFlowTest() {
     val originalMessageEntity = incomingMsgInfo?.msgEntity ?: return@getMsgInfo null
     return@getMsgInfo incomingMsgInfo.copy(
       msgEntity = originalMessageEntity.copy(
-        labelIds = labelsIds.joinToString(MessageEntity.LABEL_IDS_SEPARATOR)
+        labelIds = labelsIds.joinToString(MessageEntity.LABEL_IDS_SEPARATOR),
+        accountType = AccountEntity.ACCOUNT_TYPE_GOOGLE
       )
     )
   }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseMessageDetailsFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseMessageDetailsFlowTest.kt
index d551bd9622..8481175a59 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseMessageDetailsFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseMessageDetailsFlowTest.kt
@@ -1,12 +1,11 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.base
 
 import android.text.format.Formatter
-import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.IdlingRegistry
@@ -17,7 +16,6 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import androidx.test.espresso.matcher.BoundedMatcher
 import androidx.test.espresso.matcher.RootMatchers.isPlatformPopup
 import androidx.test.espresso.matcher.ViewMatchers.assertThat
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
@@ -48,12 +46,9 @@ import com.flowcrypt.email.rules.lazyActivityScenarioRule
 import com.flowcrypt.email.ui.activity.CreateMessageActivity
 import com.flowcrypt.email.ui.activity.MainActivity
 import com.flowcrypt.email.ui.activity.fragment.MessageDetailsFragmentArgs
-import com.flowcrypt.email.ui.adapter.MsgDetailsRecyclerViewAdapter
 import com.flowcrypt.email.ui.adapter.PgpBadgeListAdapter
 import com.flowcrypt.email.util.DateTimeUtil
 import com.flowcrypt.email.util.TestGeneralUtil
-import org.hamcrest.Description
-import org.hamcrest.Matcher
 import org.hamcrest.Matchers
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
@@ -117,46 +112,53 @@ abstract class BaseMessageDetailsFlowTest : BaseTest() {
     Thread.sleep(1000)//temporary added to complete test. Idling issue
     onView(withId(R.id.imageButtonReplyAll))
       .check(matches(isDisplayed()))
-    onView(withId(R.id.layoutReplyButton))
+    onView(withId(R.id.replyButton))
       .perform(scrollTo())
       .check(matches(isDisplayed()))
-    onView(withId(R.id.layoutReplyAllButton))
+    onView(withId(R.id.replyAllButton))
       .check(matches(isDisplayed()))
-    onView(withId(R.id.layoutFwdButton))
+    onView(withId(R.id.forwardButton))
       .check(matches(isDisplayed()))
 
     val buttonsColorId: Int
     if (msgEntity.isEncrypted == true) {
       buttonsColorId = R.color.colorPrimary
-      onView(withId(R.id.textViewReply))
+      onView(withId(R.id.replyButton))
         .check(matches(withText(getResString(R.string.reply_encrypted))))
-      onView(withId(R.id.textViewReplyAll))
+      onView(withId(R.id.replyAllButton))
         .check(matches(withText(getResString(R.string.reply_all_encrypted))))
-      onView(withId(R.id.textViewFwd))
+      onView(withId(R.id.forwardButton))
         .check(matches(withText(getResString(R.string.forward_encrypted))))
     } else {
       buttonsColorId = R.color.red
-      onView(withId(R.id.textViewReply))
+      onView(withId(R.id.replyButton))
         .check(matches(withText(getResString(R.string.reply))))
-      onView(withId(R.id.textViewReplyAll))
+      onView(withId(R.id.replyAllButton))
         .check(matches(withText(getResString(R.string.reply_all))))
-      onView(withId(R.id.textViewFwd))
+      onView(withId(R.id.forwardButton))
         .check(matches(withText(getResString(R.string.forward))))
     }
 
-    onView(withId(R.id.imageViewReply))
+    onView(withId(R.id.replyButton))
       .check(matches(withDrawable(resId = R.drawable.ic_reply, tintColor = buttonsColorId)))
-    onView(withId(R.id.imageViewReplyAll))
+    onView(withId(R.id.replyAllButton))
       .check(matches(withDrawable(resId = R.drawable.ic_reply_all, tintColor = buttonsColorId)))
-    onView(withId(R.id.imageViewFwd))
+    onView(withId(R.id.forwardButton))
       .check(matches(withDrawable(resId = R.drawable.ic_forward, tintColor = buttonsColorId)))
   }
 
-  protected fun baseCheckWithAtt(incomingMsgInfo: IncomingMessageInfo?, att: AttachmentInfo?) {
+  protected fun baseCheckWithAtt(
+    incomingMsgInfo: IncomingMessageInfo?,
+    att: AttachmentInfo?,
+    actionBeforeProceed: () -> Unit = {}
+  ) {
     assertThat(incomingMsgInfo, notNullValue())
 
     val msgEntity = incomingMsgInfo!!.msgEntity
     launchActivity(msgEntity)
+
+    actionBeforeProceed.invoke()
+
     matchHeader(incomingMsgInfo)
     Thread.sleep(1000)//temporary added to complete test. Idling issue
     //checkWebViewText(incomingMsgInfo.text) temporary disabled
@@ -291,23 +293,6 @@ abstract class BaseMessageDetailsFlowTest : BaseTest() {
     return incomingMessageInfo
   }
 
-  protected fun withHeaderInfo(header: MsgDetailsRecyclerViewAdapter.Header):
-      Matcher<RecyclerView.ViewHolder> {
-    return object : BoundedMatcher<RecyclerView.ViewHolder,
-        MsgDetailsRecyclerViewAdapter.ViewHolder>(
-      MsgDetailsRecyclerViewAdapter.ViewHolder::class.java
-    ) {
-      override fun matchesSafely(holder: MsgDetailsRecyclerViewAdapter.ViewHolder): Boolean {
-        return holder.tVHeaderName.text.toString() == header.name
-            && holder.tVHeaderValue.text.toString() == header.value
-      }
-
-      override fun describeTo(description: Description) {
-        description.appendText("with: $header")
-      }
-    }
-  }
-
   protected fun testPgpBadges(
     badgeCount: Int,
     vararg badgeTypes: PgpBadgeListAdapter.PgpBadge.Type
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenForwardWithGmailApiSignatureFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenForwardWithGmailApiSignatureFlowTest.kt
index 3f3fc081b9..04e4dd5cb8 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenForwardWithGmailApiSignatureFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenForwardWithGmailApiSignatureFlowTest.kt
@@ -6,7 +6,6 @@
 package com.flowcrypt.email.ui.gmailapi
 
 import androidx.recyclerview.widget.RecyclerView
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
@@ -88,8 +87,8 @@ class ComposeScreenForwardWithGmailApiSignatureFlowTest :
     //wait the message details rendering
     waitForObjectWithText(getResString(R.string.reply_all_encrypted), TimeUnit.SECONDS.toMillis(10))
 
-    //click on replyAll
-    openReplyScreen(R.id.layoutFwdButton, SUBJECT_EXISTING_ENCRYPTED)
+    //click on forward button
+    openReplyScreen(R.id.forwardButton, SUBJECT_EXISTING_ENCRYPTED)
 
     //need to wait while all action for reply case will be applied
     Thread.sleep(1000)
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenReplyWithGmailApiSignatureFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenReplyWithGmailApiSignatureFlowTest.kt
index 91c873ec5c..80e506be07 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenReplyWithGmailApiSignatureFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ComposeScreenReplyWithGmailApiSignatureFlowTest.kt
@@ -67,7 +67,7 @@ class ComposeScreenReplyWithGmailApiSignatureFlowTest :
   @Test
   fun testAddingSignatureAfterStart() {
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on a message
     onView(withId(R.id.recyclerViewMsgs))
@@ -81,7 +81,7 @@ class ComposeScreenReplyWithGmailApiSignatureFlowTest :
     waitForObjectWithText(getResString(R.string.reply_all_encrypted), TimeUnit.SECONDS.toMillis(10))
 
     //click on replyAll
-    openReplyScreen(R.id.layoutReplyButton, SUBJECT_EXISTING_ENCRYPTED)
+    openReplyScreen(R.id.replyButton, SUBJECT_EXISTING_ENCRYPTED)
 
     //need to wait while all action for reply case will be applied
     Thread.sleep(1000)
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
index 63abaf07fe..f9eb84c3f8 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
@@ -88,7 +88,7 @@ class EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFl
   @FlakyTest
   fun testSending() {
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on the encrypted message
     onView(withId(R.id.recyclerViewMsgs))
@@ -102,7 +102,7 @@ class EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFl
     waitForObjectWithText(getResString(R.string.forward_encrypted), TimeUnit.SECONDS.toMillis(10))
 
     //click on forward
-    openReplyScreen(R.id.layoutFwdButton, SUBJECT_EXISTING_ENCRYPTED)
+    openReplyScreen(R.id.forwardButton, SUBJECT_EXISTING_ENCRYPTED)
 
     val outgoingMessageConfiguration =
       requireNotNull(outgoingMessageConfigurationRule.outgoingMessageConfiguration)
@@ -133,20 +133,21 @@ class EncryptedForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFl
       val encryptedMessagePart = multipart.getBodyPart(0)
       val expectedText = outgoingMessageConfiguration.message + IncomingMessageInfo(
         msgEntity = MessageEntity(
-          email = "",
+          account = "",
+          accountType = "",
           folder = "",
           uid = 0,
-          fromAddress = DEFAULT_FROM_RECIPIENT,
+          fromAddresses = DEFAULT_FROM_RECIPIENT,
           subject = SUBJECT_EXISTING_ENCRYPTED,
           receivedDate = DATE_EXISTING_ENCRYPTED,
-          toAddress = InternetAddress.toString(
+          toAddresses = InternetAddress.toString(
             arrayOf(
               InternetAddress(
                 EXISTING_MESSAGE_TO_RECIPIENT
               )
             )
           ),
-          ccAddress = InternetAddress.toString(
+          ccAddresses = InternetAddress.toString(
             arrayOf(
               InternetAddress(
                 EXISTING_MESSAGE_CC_RECIPIENT
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
index f3d64255af..2af6285a94 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
@@ -26,7 +26,6 @@ import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.api.retrofit.response.model.VerificationResult
 import com.flowcrypt.email.database.entity.MessageEntity
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
-import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.junit.annotations.OutgoingMessageConfiguration
 import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.model.MessageType
@@ -50,6 +49,7 @@ import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
 
 /**
  * @author Denys Bondarenko
@@ -90,7 +90,7 @@ class EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlo
   @FlakyTest
   fun testSending() {
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on the standard message
     onView(withId(R.id.recyclerViewMsgs))
@@ -98,10 +98,10 @@ class EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlo
         POSITION_EXISTING_STANDARD, click()))
 
     //wait the message details rendering
-    Thread.sleep(1000)
+    waitForObjectWithText(MESSAGE_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on forward
-    openReplyScreen(R.id.layoutFwdButton, SUBJECT_EXISTING_STANDARD)
+    openReplyScreen(R.id.forwardButton, SUBJECT_EXISTING_STANDARD)
 
     val outgoingMessageConfiguration =
       requireNotNull(outgoingMessageConfigurationRule.outgoingMessageConfiguration)
@@ -135,20 +135,21 @@ class EncryptedForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlo
       val encryptedMessagePart = multipart.getBodyPart(0)
       val expectedText = outgoingMessageConfiguration.message + IncomingMessageInfo(
         msgEntity = MessageEntity(
-          email = "",
+          account = "",
+          accountType = "",
           folder = "",
           uid = 0,
-          fromAddress = DEFAULT_FROM_RECIPIENT,
+          fromAddresses = DEFAULT_FROM_RECIPIENT,
           subject = SUBJECT_EXISTING_STANDARD,
           receivedDate = DATE_EXISTING_STANDARD,
-          toAddress = InternetAddress.toString(
+          toAddresses = InternetAddress.toString(
             arrayOf(
               InternetAddress(
                 EXISTING_MESSAGE_TO_RECIPIENT
               )
             )
           ),
-          ccAddress = InternetAddress.toString(
+          ccAddresses = InternetAddress.toString(
             arrayOf(
               InternetAddress(
                 EXISTING_MESSAGE_CC_RECIPIENT
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt
index 077d5509e3..f9e0e9b992 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyAllComposeGmailApiFlow.kt
@@ -88,7 +88,7 @@ class EncryptedReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() {
   @FlakyTest
   fun testSending() {
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on a message
     onView(withId(R.id.recyclerViewMsgs))
@@ -102,7 +102,7 @@ class EncryptedReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() {
     waitForObjectWithText(getResString(R.string.reply_all_encrypted), TimeUnit.SECONDS.toMillis(10))
 
     //click on replyAll
-    openReplyScreen(R.id.layoutReplyAllButton, SUBJECT_EXISTING_ENCRYPTED)
+    openReplyScreen(R.id.replyAllButton, SUBJECT_EXISTING_ENCRYPTED)
 
     val outgoingMessageConfiguration =
       requireNotNull(outgoingMessageConfigurationRule.outgoingMessageConfiguration)
@@ -148,10 +148,11 @@ class EncryptedReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() {
       val expectedText = MESSAGE + EmailUtil.genReplyContent(
         IncomingMessageInfo(
           msgEntity = MessageEntity(
-            email = "",
+            account = "",
+            accountType = "",
             folder = "",
             uid = 0,
-            fromAddress = DEFAULT_FROM_RECIPIENT,
+            fromAddresses = DEFAULT_FROM_RECIPIENT,
             receivedDate = DATE_EXISTING_ENCRYPTED
 
           ),
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt
index b1331497dc..c780d72dae 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/EncryptedReplyComposeGmailApiFlow.kt
@@ -48,6 +48,7 @@ import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
 
 /**
  * @author Denys Bondarenko
@@ -88,7 +89,7 @@ class EncryptedReplyComposeGmailApiFlow : BaseComposeGmailFlow() {
   @FlakyTest
   fun testSending() {
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on a message
     onView(withId(R.id.recyclerViewMsgs))
@@ -99,10 +100,10 @@ class EncryptedReplyComposeGmailApiFlow : BaseComposeGmailFlow() {
       )
 
     //wait the message details rendering
-    Thread.sleep(1000)
+    waitForObjectWithText(MESSAGE_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on reply
-    openReplyScreen(R.id.layoutReplyButton, SUBJECT_EXISTING_STANDARD)
+    openReplyScreen(R.id.replyButton, SUBJECT_EXISTING_STANDARD)
 
     //switch to encrypted mode
     openActionBarOverflowOrOptionsMenu(getTargetContext())
@@ -148,10 +149,11 @@ class EncryptedReplyComposeGmailApiFlow : BaseComposeGmailFlow() {
       val expectedText = MESSAGE + EmailUtil.genReplyContent(
         IncomingMessageInfo(
           msgEntity = MessageEntity(
-            email = "",
+            account = "",
+            accountType = "",
             folder = "",
             uid = 0,
-            fromAddress = DEFAULT_FROM_RECIPIENT,
+            fromAddresses = DEFAULT_FROM_RECIPIENT,
             receivedDate = DATE_EXISTING_STANDARD
 
           ),
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/SearchMessagesGmailApiFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/SearchMessagesGmailApiFlowTest.kt
index 1bdfe47475..9554f79e5a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/SearchMessagesGmailApiFlowTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/SearchMessagesGmailApiFlowTest.kt
@@ -14,6 +14,7 @@ import androidx.test.espresso.action.ViewActions.pressKey
 import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -22,21 +23,27 @@ import androidx.test.filters.MediumTest
 import com.flowcrypt.email.R
 import com.flowcrypt.email.TestConstants
 import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withRecyclerViewItemCount
 import com.flowcrypt.email.rules.ClearAppSettingsRule
 import com.flowcrypt.email.rules.FlowCryptMockWebServerRule
 import com.flowcrypt.email.rules.GrantPermissionRuleChooser
 import com.flowcrypt.email.rules.RetryRule
 import com.flowcrypt.email.rules.ScreenshotTestRule
 import com.flowcrypt.email.ui.base.BaseGmailApiTest
+import com.google.api.client.json.gson.GsonFactory
+import com.google.api.services.gmail.model.ListMessagesResponse
+import com.google.api.services.gmail.model.Message
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
+import org.hamcrest.Matchers.allOf
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 import java.net.HttpURLConnection
+import java.util.concurrent.TimeUnit
 
 /**
  * @author Denys Bondarenko
@@ -50,9 +57,16 @@ class SearchMessagesGmailApiFlowTest : BaseGmailApiTest() {
     FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() {
       override fun dispatch(request: RecordedRequest): MockResponse {
         return when {
-          request.path == "/gmail/v1/users/me/messages?maxResults=45&q=android" -> {
+          request.path == "/gmail/v1/users/me/messages?maxResults=45&q=$SUBJECT_EXISTING_STANDARD" -> {
             MockResponse().setResponseCode(HttpURLConnection.HTTP_OK).setBody(
-              LIST_MESSAGES_RESPONSE_ALL_MESSAGE.toString()
+              ListMessagesResponse().apply {
+                factory = GsonFactory.getDefaultInstance()
+                messages = listOf(
+                  Message().apply {
+                    id = MESSAGE_ID_EXISTING_STANDARD
+                  }
+                )
+              }.toString()
             )
           }
 
@@ -76,41 +90,28 @@ class SearchMessagesGmailApiFlowTest : BaseGmailApiTest() {
   @Test
   fun testSearchMessages() {
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
+    onView(withId(R.id.recyclerViewMsgs))
+      .check(matches(withRecyclerViewItemCount(3)))
 
     onView(withId(R.id.menuSearch))
       .check(matches(isDisplayed()))
       .perform(click())
     onView(withId(com.google.android.material.R.id.search_src_text))
-      .perform(clearText(), replaceText(SEARCH_TEXT))
+      .perform(click(), clearText(), replaceText(SUBJECT_EXISTING_STANDARD))
       .perform(pressKey(KeyEvent.KEYCODE_ENTER))
 
-    //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    //need to wait while the app loads the search result
+    waitForObjectWithText("From", TimeUnit.SECONDS.toMillis(10))
 
-    //click on a message
+    //check relevant search
+    onView(withId(R.id.recyclerViewMsgs))
+      .check(matches(withRecyclerViewItemCount(1)))
     onView(withId(R.id.recyclerViewMsgs))
       .perform(
-        RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(
-          POSITION_EXISTING_ENCRYPTED, click()
+        RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
+          hasDescendant(allOf(withText(SUBJECT_EXISTING_STANDARD), withId(R.id.textViewSubject)))
         )
       )
-
-    //wait the message details rendering
-    Thread.sleep(1000)
-
-    //check that correct message is displayed
-    onView(withText(SUBJECT_EXISTING_ENCRYPTED))
-      .check(matches(isDisplayed()))
-
-    Thread.sleep(5000)
-
-    //check that correct message is still displayed
-    onView(withText(SUBJECT_EXISTING_ENCRYPTED))
-      .check(matches(isDisplayed()))
-  }
-
-  companion object {
-    private const val SEARCH_TEXT = "android"
   }
 }
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
index 2f9a72e566..f84504d522 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
@@ -90,7 +90,7 @@ class StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlo
   @FlakyTest
   fun testSending() {
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on the encrypted message
     onView(withId(R.id.recyclerViewMsgs))
@@ -104,7 +104,7 @@ class StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlo
     waitForObjectWithText(getResString(R.string.forward_encrypted), TimeUnit.SECONDS.toMillis(10))
 
     //click on forward
-    openReplyScreen(R.id.layoutFwdButton, SUBJECT_EXISTING_ENCRYPTED)
+    openReplyScreen(R.id.forwardButton, SUBJECT_EXISTING_ENCRYPTED)
 
     //switch to standard mode
     openActionBarOverflowOrOptionsMenu(getTargetContext())
@@ -141,20 +141,21 @@ class StandardForwardOfEncryptedMessageWithOriginalAttachmentsComposeGmailApiFlo
       assertEquals(
         outgoingMessageConfiguration.message + IncomingMessageInfo(
           msgEntity = MessageEntity(
-            email = "",
+            account = "",
+            accountType = "",
             folder = "",
             uid = 0,
-            fromAddress = DEFAULT_FROM_RECIPIENT,
+            fromAddresses = DEFAULT_FROM_RECIPIENT,
             subject = SUBJECT_EXISTING_ENCRYPTED,
             receivedDate = DATE_EXISTING_ENCRYPTED,
-            toAddress = InternetAddress.toString(
+            toAddresses = InternetAddress.toString(
               arrayOf(
                 InternetAddress(
                   EXISTING_MESSAGE_TO_RECIPIENT
                 )
               )
             ),
-            ccAddress = InternetAddress.toString(
+            ccAddresses = InternetAddress.toString(
               arrayOf(
                 InternetAddress(
                   EXISTING_MESSAGE_CC_RECIPIENT
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedPgpMimeMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedPgpMimeMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
index 09d33400a7..32c877e8c0 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedPgpMimeMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfEncryptedPgpMimeMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
@@ -48,6 +48,7 @@ import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
 
 /**
  * @author Denys Bondarenko
@@ -86,9 +87,8 @@ class StandardForwardOfEncryptedPgpMimeMessageWithOriginalAttachmentsComposeGmai
 
   @Test
   fun testSending() {
-
     //need to wait while the app loads the messages list
-    Thread.sleep(2000)
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on the encrypted message
     onView(withId(R.id.recyclerViewMsgs))
@@ -99,10 +99,10 @@ class StandardForwardOfEncryptedPgpMimeMessageWithOriginalAttachmentsComposeGmai
       )
 
     //wait the message details rendering
-    Thread.sleep(2000)
+    waitForObjectWithText(MESSAGE_EXISTING_PGP_MIME, TimeUnit.SECONDS.toMillis(10))
 
     //click on forward
-    openReplyScreen(R.id.layoutFwdButton, SUBJECT_EXISTING_PGP_MIME)
+    openReplyScreen(R.id.forwardButton, SUBJECT_EXISTING_PGP_MIME)
 
     //switch to standard mode
     openActionBarOverflowOrOptionsMenu(getTargetContext())
@@ -135,20 +135,21 @@ class StandardForwardOfEncryptedPgpMimeMessageWithOriginalAttachmentsComposeGmai
       val fwdTextPart = multipart.getBodyPart(0)
       val expectedMessageText = outgoingMessageConfiguration.message + IncomingMessageInfo(
         msgEntity = MessageEntity(
-          email = "",
+          account = "",
+          accountType = "",
           folder = "",
           uid = 0,
-          fromAddress = DEFAULT_FROM_RECIPIENT,
+          fromAddresses = DEFAULT_FROM_RECIPIENT,
           subject = SUBJECT_EXISTING_PGP_MIME,
           receivedDate = DATE_EXISTING_PGP_MIME,
-          toAddress = InternetAddress.toString(
+          toAddresses = InternetAddress.toString(
             arrayOf(
               InternetAddress(
                 EXISTING_MESSAGE_TO_RECIPIENT
               )
             )
           ),
-          ccAddress = InternetAddress.toString(
+          ccAddresses = InternetAddress.toString(
             arrayOf(
               InternetAddress(
                 EXISTING_MESSAGE_CC_RECIPIENT
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
index f47e0b4a68..5b3741df98 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow.kt
@@ -102,7 +102,7 @@ class StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow
     waitForObjectWithText(MESSAGE_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on forward
-    openReplyScreen(R.id.layoutFwdButton, SUBJECT_EXISTING_STANDARD)
+    openReplyScreen(R.id.forwardButton, SUBJECT_EXISTING_STANDARD)
 
     val outgoingMessageConfiguration =
       requireNotNull(outgoingMessageConfigurationRule.outgoingMessageConfiguration)
@@ -131,20 +131,21 @@ class StandardForwardOfStandardMessageWithOriginalAttachmentsComposeGmailApiFlow
       assertEquals(
         outgoingMessageConfiguration.message + IncomingMessageInfo(
           msgEntity = MessageEntity(
-            email = "",
+            account = "",
+            accountType = "",
             folder = "",
             uid = 0,
-            fromAddress = DEFAULT_FROM_RECIPIENT,
+            fromAddresses = DEFAULT_FROM_RECIPIENT,
             subject = SUBJECT_EXISTING_STANDARD,
             receivedDate = DATE_EXISTING_STANDARD,
-            toAddress = InternetAddress.toString(
+            toAddresses = InternetAddress.toString(
               arrayOf(
                 InternetAddress(
                   EXISTING_MESSAGE_TO_RECIPIENT
                 )
               )
             ),
-            ccAddress = InternetAddress.toString(
+            ccAddresses = InternetAddress.toString(
               arrayOf(
                 InternetAddress(
                   EXISTING_MESSAGE_CC_RECIPIENT
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt
index a1ea10049f..dbbb575c8f 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyAllComposeGmailApiFlow.kt
@@ -101,7 +101,7 @@ class StandardReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() {
     waitForObjectWithText(MESSAGE_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
 
     //click on replyAll
-    openReplyScreen(R.id.layoutReplyAllButton, SUBJECT_EXISTING_STANDARD)
+    openReplyScreen(R.id.replyAllButton, SUBJECT_EXISTING_STANDARD)
 
     val outgoingMessageConfiguration =
       requireNotNull(outgoingMessageConfigurationRule.outgoingMessageConfiguration)
@@ -130,10 +130,11 @@ class StandardReplyAllComposeGmailApiFlow : BaseComposeGmailFlow() {
         MESSAGE + EmailUtil.genReplyContent(
           IncomingMessageInfo(
             msgEntity = MessageEntity(
-              email = "",
+              account = "",
+              accountType = "",
               folder = "",
               uid = 0,
-              fromAddress = DEFAULT_FROM_RECIPIENT,
+              fromAddresses = DEFAULT_FROM_RECIPIENT,
               receivedDate = DATE_EXISTING_STANDARD
 
             ),
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt
index 389b9e9853..d4ee4c550c 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardReplyComposeGmailApiFlow.kt
@@ -101,7 +101,7 @@ class StandardReplyComposeGmailApiFlow : BaseComposeGmailFlow() {
     waitForObjectWithText(getResString(R.string.forward_encrypted), TimeUnit.SECONDS.toMillis(10))
 
     //click on reply
-    openReplyScreen(R.id.layoutReplyButton, SUBJECT_EXISTING_STANDARD)
+    openReplyScreen(R.id.replyButton, SUBJECT_EXISTING_STANDARD)
 
     val outgoingMessageConfiguration =
       requireNotNull(outgoingMessageConfigurationRule.outgoingMessageConfiguration)
@@ -144,10 +144,11 @@ class StandardReplyComposeGmailApiFlow : BaseComposeGmailFlow() {
         MESSAGE + EmailUtil.genReplyContent(
           IncomingMessageInfo(
             msgEntity = MessageEntity(
-              email = "",
+              account = "",
+              accountType = "",
               folder = "",
               uid = 0,
-              fromAddress = DEFAULT_FROM_RECIPIENT,
+              fromAddresses = DEFAULT_FROM_RECIPIENT,
               receivedDate = DATE_EXISTING_STANDARD
 
             ),
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsAttachmentsActionsGmailApiFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsAttachmentsActionsGmailApiFlowTest.kt
new file mode 100644
index 0000000000..49d2fbe731
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsAttachmentsActionsGmailApiFlowTest.kt
@@ -0,0 +1,125 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.gmailapi
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.Until
+import com.flowcrypt.email.Constants
+import com.flowcrypt.email.R
+import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.GrantPermissionRuleChooser
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.gmailapi.base.BaseThreadDetailsGmailApiFlowTest
+import com.flowcrypt.email.viewaction.ClickOnViewInRecyclerViewItem
+import org.hamcrest.Matchers.allOf
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+/**
+ * @author Denys Bondarenko
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@FlowCryptTestSettings(useCommonIdling = false)
+class ThreadDetailsAttachmentsActionsGmailApiFlowTest : BaseThreadDetailsGmailApiFlowTest() {
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
+    .around(GrantPermissionRuleChooser.grant(android.Manifest.permission.POST_NOTIFICATIONS))
+    .around(mockWebServerRule)
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(addLabelsToDatabaseRule)
+    .around(customLabelsRule)
+    .around(activityScenarioRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testAttachmentsPreview() {
+    openThreadBasedOnPosition(2)
+    checkAttachments(
+      listOf(
+        Pair(ATTACHMENT_NAME_1 + "." + Constants.PGP_FILE_EXT, -1),
+        Pair(ATTACHMENT_NAME_3 + "." + Constants.PGP_FILE_EXT, -1)
+      )
+    )
+
+    onView(allOf(withId(R.id.rVAttachments), isDisplayed()))
+      .perform(
+        RecyclerViewActions.actionOnItem<ViewHolder>(
+          hasDescendant(
+            allOf(
+              withId(R.id.textViewAttachmentName),
+              withText(ATTACHMENT_NAME_1 + "." + Constants.PGP_FILE_EXT)
+            )
+          ),
+          ClickOnViewInRecyclerViewItem(R.id.imageButtonPreviewAtt)
+        )
+      )
+
+    waitForObjectWithText(
+      getResString(R.string.warning_don_not_have_content_app),
+      TimeUnit.SECONDS.toMillis(10)
+    )
+    isDialogWithTextDisplayed(decorView, getResString(R.string.warning_don_not_have_content_app))
+  }
+
+  @Test
+  fun testAttachmentsDownload() {
+    openThreadBasedOnPosition(2)
+    checkAttachments(
+      listOf(
+        Pair(ATTACHMENT_NAME_1 + "." + Constants.PGP_FILE_EXT, -1),
+        Pair(ATTACHMENT_NAME_3 + "." + Constants.PGP_FILE_EXT, -1)
+      )
+    )
+
+    val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    try {
+      onView(allOf(withId(R.id.rVAttachments), isDisplayed()))
+        .perform(
+          RecyclerViewActions.actionOnItem<ViewHolder>(
+            hasDescendant(
+              allOf(
+                withId(R.id.textViewAttachmentName),
+                withText(ATTACHMENT_NAME_1 + "." + Constants.PGP_FILE_EXT)
+              )
+            ),
+            ClickOnViewInRecyclerViewItem(R.id.imageButtonDownloadAtt)
+          )
+        )
+      device.openNotification()
+      device.wait(
+        Until.hasObject(By.text(ATTACHMENT_NAME_1)),
+        TimeUnit.SECONDS.toMillis(10)
+      )
+      device.pressBack()
+    } finally {
+      //close the notification bar if needed
+      if (device.hasObject(By.res(NOTIFICATION_RESOURCES_NAME))) {
+        device.pressBack()
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsGmailApiFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsGmailApiFlowTest.kt
new file mode 100644
index 0000000000..f40a5ca919
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsGmailApiFlowTest.kt
@@ -0,0 +1,409 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.gmailapi
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.contrib.RecyclerViewActions.scrollTo
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.flowcrypt.email.Constants
+import com.flowcrypt.email.R
+import com.flowcrypt.email.database.entity.RecipientEntity
+import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
+import com.flowcrypt.email.extensions.kotlin.asInternetAddress
+import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.rules.AddRecipientsToDatabaseRule
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.GrantPermissionRuleChooser
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.adapter.GmailApiLabelsListAdapter
+import com.flowcrypt.email.ui.adapter.PgpBadgeListAdapter
+import com.flowcrypt.email.ui.gmailapi.base.BaseThreadDetailsGmailApiFlowTest
+import com.flowcrypt.email.viewaction.ClickOnViewInRecyclerViewItem
+import org.hamcrest.Matchers.allOf
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+/**
+ * @author Denys Bondarenko
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@FlowCryptTestSettings(useCommonIdling = false)
+class ThreadDetailsGmailApiFlowTest : BaseThreadDetailsGmailApiFlowTest() {
+
+  private val recipientWithPubKeys = listOf(
+    RecipientWithPubKeys(
+      RecipientEntity(
+        email = addAccountToDatabaseRule.account.email,
+        name = "Default"
+      ),
+      listOf(
+        addPrivateKeyToDatabaseRule.pgpKeyRingDetails
+          .toPublicKeyEntity(addAccountToDatabaseRule.account.email)
+          .copy(id = 1)
+      )
+    ),
+    requireNotNull(DEFAULT_FROM_RECIPIENT.asInternetAddress()).let {
+      RecipientWithPubKeys(
+        RecipientEntity(
+          email = it.address,
+          name = it.personal
+        ),
+        listOf(
+          defaultFromPgpKeyDetails
+            .toPublicKeyEntity(defaultFromPgpKeyDetails.getUserIdsAsSingleString())
+            .copy(id = 2)
+        )
+      )
+    },
+    RecipientWithPubKeys(
+      RecipientEntity(email = EXISTING_MESSAGE_CC_RECIPIENT),
+      listOf(
+        existingCcPgpKeyDetails
+          .toPublicKeyEntity(existingCcPgpKeyDetails.getUserIdsAsSingleString())
+          .copy(id = 3)
+      )
+    )
+  )
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
+    .around(GrantPermissionRuleChooser.grant(android.Manifest.permission.POST_NOTIFICATIONS))
+    .around(mockWebServerRule)
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(AddRecipientsToDatabaseRule(recipientWithPubKeys))
+    .around(addLabelsToDatabaseRule)
+    .around(customLabelsRule)
+    .around(activityScenarioRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testThreadDetailsWithSingleStandardMessage() {
+    openThreadBasedOnPosition(5)
+    checkCorrectThreadDetails(
+      messagesCount = 1,
+      threadSubject = SUBJECT_SINGLE_STANDARD,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+    checkBaseMessageDetailsInTread(
+      fromAddress = "From",
+      datetimeInMilliseconds = DATE_EXISTING_STANDARD
+    )
+    checkPgpBadges(
+      2,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_SIGNED,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_ENCRYPTED
+    )
+    checkWebViewText(MESSAGE_EXISTING_STANDARD)
+    checkAttachments(
+      listOf(
+        Pair(ATTACHMENT_NAME_1, attachmentsDataCache[0].size.toLong())
+      )
+    )
+    checkReplyButtons(isEncryptedMode = false)
+    checkCollapsedState(1, hasPgp = false, hasAttachments = true)
+  }
+
+  @Test
+  fun testThreadDetailsWithSingleEncryptedMessage() {
+    openThreadBasedOnPosition(1)
+    checkCorrectThreadDetails(
+      messagesCount = 1,
+      threadSubject = SUBJECT_SINGLE_ENCRYPTED,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+    checkBaseMessageDetailsInTread(
+      fromAddress = "From",
+      datetimeInMilliseconds = DATE_EXISTING_ENCRYPTED
+    )
+    checkPgpBadges(
+      2,
+      PgpBadgeListAdapter.PgpBadge.Type.ENCRYPTED,
+      PgpBadgeListAdapter.PgpBadge.Type.SIGNED
+    )
+    checkWebViewText(MESSAGE_EXISTING_ENCRYPTED)
+    checkAttachments(
+      listOf(
+        Pair(ATTACHMENT_NAME_1 + "." + Constants.PGP_FILE_EXT, -1),
+        Pair(ATTACHMENT_NAME_3 + "." + Constants.PGP_FILE_EXT, -1)
+      )
+    )
+    checkReplyButtons(isEncryptedMode = true)
+    checkCollapsedState(1, hasPgp = true, hasAttachments = true)
+  }
+
+  @Test
+  fun testThreadDetailsWithFewEncryptedMessages() {
+    openThreadBasedOnPosition(0)
+    checkCorrectThreadDetails(
+      messagesCount = 2,
+      threadSubject = SUBJECT_EXISTING_ENCRYPTED,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+    checkBaseMessageDetailsInTread(
+      fromAddress = "From",
+      datetimeInMilliseconds = DATE_EXISTING_ENCRYPTED
+    )
+    checkPgpBadges(
+      2,
+      PgpBadgeListAdapter.PgpBadge.Type.ENCRYPTED,
+      PgpBadgeListAdapter.PgpBadge.Type.SIGNED
+    )
+    checkWebViewText(MESSAGE_EXISTING_ENCRYPTED)
+    checkAttachments(
+      listOf(
+        Pair(ATTACHMENT_NAME_1 + "." + Constants.PGP_FILE_EXT, -1),
+        Pair(ATTACHMENT_NAME_3 + "." + Constants.PGP_FILE_EXT, -1)
+      )
+    )
+    checkReplyButtons(isEncryptedMode = true)
+    checkCollapsedState(1, hasPgp = true, hasAttachments = true)
+    checkCollapsedState(
+      2, hasPgp = true, hasAttachments = true, needToCollapseVisibleExpandedItem = false
+    )
+  }
+
+  @Test
+  fun testThreadDetailsWithFewStandardMessages() {
+    openThreadBasedOnPosition(3)
+    checkCorrectThreadDetails(
+      messagesCount = 2,
+      threadSubject = SUBJECT_EXISTING_STANDARD,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+    checkBaseMessageDetailsInTread(
+      fromAddress = "From",
+      datetimeInMilliseconds = DATE_EXISTING_STANDARD
+    )
+    checkPgpBadges(
+      2,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_ENCRYPTED,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_SIGNED
+    )
+    checkWebViewText(MESSAGE_EXISTING_STANDARD)
+    checkAttachments(
+      listOf(
+        Pair(ATTACHMENT_NAME_1, attachmentsDataCache[0].size.toLong())
+      )
+    )
+    checkReplyButtons(isEncryptedMode = false)
+    checkCollapsedState(1, hasPgp = false, hasAttachments = true)
+    checkCollapsedState(
+      2,
+      hasPgp = false,
+      hasAttachments = true,
+      needToCollapseVisibleExpandedItem = false
+    )
+  }
+
+  @Test
+  fun testThreadDetailsWithMixedMessages() {
+    openThreadBasedOnPosition(2)
+    checkCorrectThreadDetails(
+      messagesCount = 2,
+      threadSubject = SUBJECT_MIXED_MESSAGES,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+    checkBaseMessageDetailsInTread(
+      fromAddress = "From",
+      datetimeInMilliseconds = DATE_EXISTING_ENCRYPTED
+    )
+    checkPgpBadges(
+      2,
+      PgpBadgeListAdapter.PgpBadge.Type.ENCRYPTED,
+      PgpBadgeListAdapter.PgpBadge.Type.SIGNED
+    )
+    checkWebViewText(MESSAGE_EXISTING_ENCRYPTED)
+    checkAttachments(
+      listOf(
+        Pair(ATTACHMENT_NAME_1 + "." + Constants.PGP_FILE_EXT, -1),
+        Pair(ATTACHMENT_NAME_3 + "." + Constants.PGP_FILE_EXT, -1)
+      )
+    )
+    checkReplyButtons(isEncryptedMode = true)
+    checkCollapsedState(1, hasPgp = false, hasAttachments = false)
+    checkCollapsedState(
+      2,
+      hasPgp = true,
+      hasAttachments = true,
+      needToCollapseVisibleExpandedItem = false
+    )
+  }
+
+  @Test
+  fun testThreadDetailsWithMessagesWithoutAttachments() {
+    openThreadBasedOnPosition(4)
+    checkCorrectThreadDetails(
+      messagesCount = 2,
+      threadSubject = SUBJECT_NO_ATTACHMENTS,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+    checkBaseMessageDetailsInTread(
+      fromAddress = "From",
+      datetimeInMilliseconds = DATE_EXISTING_STANDARD
+    )
+    checkPgpBadges(
+      2,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_ENCRYPTED,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_SIGNED
+    )
+    checkWebViewText(MESSAGE_EXISTING_STANDARD)
+    checkAttachments(listOf())
+    checkReplyButtons(isEncryptedMode = false)
+    checkCollapsedState(1, hasPgp = false, hasAttachments = false)
+    checkCollapsedState(
+      2,
+      hasPgp = false,
+      hasAttachments = false,
+      needToCollapseVisibleExpandedItem = false
+    )
+  }
+
+  @Test
+  fun testThreadDetailsFewMessagesAndSingleDraft() {
+    openThreadBasedOnPosition(6)
+    checkCorrectThreadDetails(
+      messagesCount = 3,
+      threadSubject = SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+
+    checkBaseMessageDetailsInTread(
+      fromAddress = "me (Draft)",
+      datetimeInMilliseconds = DATE_EXISTING_STANDARD
+    ) {
+      it.toMutableMap().apply {
+        put(getResString(R.string.from), addAccountToDatabaseRule.account.email)
+        put(getResString(R.string.reply_to), addAccountToDatabaseRule.account.email)
+        put(getResString(R.string.to), addAccountToDatabaseRule.account.email)
+      }
+    }
+
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        scrollTo<ViewHolder>(
+          allOf(
+            hasDescendant(
+              allOf(
+                withId(R.id.imageButtonEditDraft),
+                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
+              )
+            ),
+            hasDescendant(
+              allOf(
+                withId(R.id.imageButtonDeleteDraft),
+                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
+              )
+            )
+          )
+        )
+      )
+
+    checkPgpBadges(
+      2,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_ENCRYPTED,
+      PgpBadgeListAdapter.PgpBadge.Type.NOT_SIGNED
+    )
+    checkWebViewText(MESSAGE_EXISTING_STANDARD)
+    checkAttachments(listOf())
+    checkReplyButtons(isVisible = false)
+  }
+
+  @Test
+  fun testDeleteDraftInThread() {
+    openThreadBasedOnPosition(6)
+    checkCorrectThreadDetails(
+      messagesCount = 3,
+      threadSubject = SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+
+    //check that a draft is displayed
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        scrollTo<ViewHolder>(
+          allOf(
+            hasDescendant(
+              allOf(
+                withId(R.id.imageButtonEditDraft),
+                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
+              )
+            ),
+            hasDescendant(
+              allOf(
+                withId(R.id.imageButtonDeleteDraft),
+                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
+              )
+            )
+          )
+        )
+      )
+    checkWebViewText(MESSAGE_EXISTING_STANDARD)
+
+    //check that reply buttons are hidden
+    checkReplyButtons(isVisible = false)
+
+    //delete the draft
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        RecyclerViewActions.actionOnItemAtPosition<ViewHolder>(
+          3,
+          ClickOnViewInRecyclerViewItem(R.id.imageButtonDeleteDraft)
+        )
+      )
+
+    onView(withText(getResString(R.string.delete)))
+      .inRoot(isDialog())
+      .check(matches(isDisplayed()))
+      .perform(click())
+
+    //check that the draft delete from the messages list
+    Thread.sleep(TimeUnit.SECONDS.toMillis(2))
+    checkCorrectThreadDetails(
+      messagesCount = 2,
+      threadSubject = SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsSwipeToRefreshGmailApiFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsSwipeToRefreshGmailApiFlowTest.kt
new file mode 100644
index 0000000000..11b9f6a370
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadDetailsSwipeToRefreshGmailApiFlowTest.kt
@@ -0,0 +1,131 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.gmailapi
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.swipeDown
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.flowcrypt.email.R
+import com.flowcrypt.email.TestConstants
+import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.FlowCryptMockWebServerRule
+import com.flowcrypt.email.rules.GrantPermissionRuleChooser
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.adapter.GmailApiLabelsListAdapter
+import com.flowcrypt.email.ui.gmailapi.base.BaseThreadDetailsGmailApiFlowTest
+import com.flowcrypt.email.viewaction.CustomViewActions.swipeToRefresh
+import com.google.api.client.json.Json
+import com.google.api.client.json.gson.GsonFactory
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.RecordedRequest
+import org.hamcrest.Matchers.allOf
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+import java.net.HttpURLConnection
+
+/**
+ * @author Denys Bondarenko
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@FlowCryptTestSettings(useCommonIdling = false)
+class ThreadDetailsSwipeToRefreshGmailApiFlowTest : BaseThreadDetailsGmailApiFlowTest() {
+
+  private var shouldReturnOnlyOneMessage = false
+
+  override val mockWebServerRule =
+    FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() {
+      override fun dispatch(request: RecordedRequest): MockResponse {
+        return when {
+          //https://flowcrypt.test/gmail/v1/users/me/threads/200000e222d6c001?format=full
+          request.method == "GET" && request.path?.matches(REGEX_USER_THREADS_GET_FORMAT_FULL) == true -> {
+            val path = request.path ?: ""
+            val threadId =
+              REGEX_USER_THREADS_GET_FORMAT_FULL.find(path)?.groups?.get(1)?.value?.trim()
+            if (threadId == THREAD_ID_ONLY_STANDARD) {
+              if (shouldReturnOnlyOneMessage) {
+                MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
+                  .setHeader("Content-Type", Json.MEDIA_TYPE)
+                  .setBody(
+                    com.google.api.services.gmail.model.Thread().apply {
+                      factory = GsonFactory.getDefaultInstance()
+                      id = THREAD_ID_ONLY_STANDARD
+                      messages = listOf(
+                        genStandardMessage(
+                          threadId = THREAD_ID_ONLY_STANDARD,
+                          messageId = MESSAGE_ID_THREAD_ONLY_STANDARD_1,
+                          isFullFormat = true,
+                          includeBinaryAttachment = false
+                        )
+                      )
+                    }.toString()
+                  )
+              } else {
+                handleCommonAPICalls(request)
+              }
+            } else {
+              handleCommonAPICalls(request)
+            }
+          }
+
+          else -> handleCommonAPICalls(request)
+        }
+      }
+    })
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
+    .around(GrantPermissionRuleChooser.grant(android.Manifest.permission.POST_NOTIFICATIONS))
+    .around(mockWebServerRule)
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(addLabelsToDatabaseRule)
+    .around(customLabelsRule)
+    .around(activityScenarioRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testUpdatingThreadAfterSwipeToRefresh() {
+    openThreadBasedOnPosition(3)
+    checkCorrectThreadDetails(
+      messagesCount = 2,
+      threadSubject = SUBJECT_EXISTING_STANDARD,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+
+    shouldReturnOnlyOneMessage = true
+
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD)
+    checkCollapsedState(1, hasPgp = false, hasAttachments = true)
+
+    //swipe down to refresh
+    onView(allOf(withId(R.id.swipeRefreshLayout), isDisplayed()))
+      .perform(swipeToRefresh(swipeDown(), isDisplayingAtLeast(85)))
+    Thread.sleep(1000)
+
+    checkCorrectThreadDetails(
+      messagesCount = 1,
+      threadSubject = SUBJECT_EXISTING_STANDARD,
+      labels = listOf(
+        GmailApiLabelsListAdapter.Label("Inbox")
+      )
+    )
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadsListGmailApiFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadsListGmailApiFlowTest.kt
new file mode 100644
index 0000000000..3d1d87e834
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/ThreadsListGmailApiFlowTest.kt
@@ -0,0 +1,207 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.gmailapi
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.flowcrypt.email.R
+import com.flowcrypt.email.TestConstants
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
+import com.flowcrypt.email.rules.AddLabelsToDatabaseRule
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.FlowCryptMockWebServerRule
+import com.flowcrypt.email.rules.GrantPermissionRuleChooser
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.adapter.GmailApiLabelsListAdapter
+import com.flowcrypt.email.ui.base.BaseGmailApiTest
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.RecordedRequest
+import org.hamcrest.Matchers.allOf
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+/**
+ * @author Denys Bondarenko
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@FlowCryptTestSettings(useCommonIdling = false)
+class ThreadsListGmailApiFlowTest : BaseGmailApiTest(
+  BASE_ACCOUNT_ENTITY.copy(useConversationMode = true)
+) {
+  override val mockWebServerRule =
+    FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() {
+      override fun dispatch(request: RecordedRequest): MockResponse {
+        return when {
+          else -> handleCommonAPICalls(request)
+        }
+      }
+    })
+
+  private val customLabelsRule = AddLabelsToDatabaseRule(
+    account = accountEntity, folders = CUSTOM_LABELS.map {
+      LocalFolder(
+        account = addAccountToDatabaseRule.account.email,
+        fullName = it.name,
+        folderAlias = it.name,
+        isCustom = true,
+        labelColor = it.backgroundColor,
+        textColor = it.textColor,
+        attributes = listOf("\\HasNoChildren")
+      )
+    }
+  )
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
+    .around(GrantPermissionRuleChooser.grant(android.Manifest.permission.POST_NOTIFICATIONS))
+    .around(mockWebServerRule)
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(addLabelsToDatabaseRule)
+    .around(customLabelsRule)
+    .around(activityScenarioRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testShowCorrectThreadsDetailsInList() {
+    //need to wait while the app loads the thread list
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
+
+    //test thread with 2 standard messages with attachments
+    checkThreadRowDetails(
+      subject = SUBJECT_EXISTING_STANDARD,
+      senderPattern = "From (2)",
+      hasAttachments = true,
+      hasPgp = false
+    )
+
+    //test thread with 2 encrypted messages with attachments
+    checkThreadRowDetails(
+      subject = SUBJECT_EXISTING_ENCRYPTED,
+      senderPattern = "From (2)",
+      hasAttachments = true,
+      hasPgp = true
+    )
+
+    //test thread with 2 standard messages without attachments
+    checkThreadRowDetails(
+      subject = SUBJECT_NO_ATTACHMENTS,
+      senderPattern = "From (2)",
+      hasAttachments = false,
+      hasPgp = false
+    )
+
+    //test thread with 1 message in thread
+    checkThreadRowDetails(
+      subject = SUBJECT_SINGLE_STANDARD,
+      senderPattern = "From",
+      hasAttachments = true,
+      hasPgp = false
+    )
+
+    //test thread with a few messages in thread + 1 draft
+    checkThreadRowDetails(
+      subject = SUBJECT_FEW_MESSAGES_WITH_SINGLE_DRAFT,
+      senderPattern = "From, me, Draft (3)",
+      hasAttachments = true,
+      hasPgp = false
+    )
+
+    //test thread with a few messages in thread + few draft
+    checkThreadRowDetails(
+      subject = SUBJECT_FEW_MESSAGES_WITH_FEW_DRAFTS,
+      senderPattern = "From, Drafts(2) (4)",
+      hasAttachments = true,
+      hasPgp = false
+    )
+
+    //test thread with one message in thread + few draft
+    checkThreadRowDetails(
+      subject = SUBJECT_ONE_MESSAGE_WITH_FEW_DRAFTS,
+      senderPattern = "From, Drafts(2) (3)",
+      hasAttachments = true,
+      hasPgp = false
+    )
+  }
+
+  private fun checkThreadRowDetails(
+    subject: String,
+    senderPattern: String,
+    hasAttachments: Boolean,
+    hasPgp: Boolean,
+  ) {
+    onView(withId(R.id.recyclerViewMsgs))
+      .perform(
+        RecyclerViewActions.scrollTo<ViewHolder>(
+          allOf(
+            hasDescendant(
+              allOf(
+                withId(R.id.textViewSubject),
+                withText(subject)
+              ),
+            ),
+            hasDescendant(
+              allOf(
+                withId(R.id.textViewSenderAddress),
+                withText(senderPattern)
+              ),
+            ),
+            hasDescendant(
+              allOf(
+                withId(R.id.imageViewAtts),
+                withEffectiveVisibility(
+                  if (hasAttachments) {
+                    ViewMatchers.Visibility.VISIBLE
+                  } else {
+                    ViewMatchers.Visibility.GONE
+                  }
+                )
+              ),
+            ),
+            hasDescendant(
+              allOf(
+                withId(R.id.viewHasPgp),
+                withEffectiveVisibility(
+                  if (hasPgp) {
+                    ViewMatchers.Visibility.VISIBLE
+                  } else {
+                    ViewMatchers.Visibility.GONE
+                  }
+                )
+              ),
+            ),
+          )
+        )
+      )
+  }
+
+  companion object {
+    private val CUSTOM_LABELS = listOf(
+      GmailApiLabelsListAdapter.Label("LABEL_1", "#ff2323ff", "#FFFFFF"),
+      GmailApiLabelsListAdapter.Label("LABEL_2", "#FFD14836", "#FFFFFF"),
+      GmailApiLabelsListAdapter.Label("LABEL_3", "#FFFFEB3B", "#FFFFFF"),
+      GmailApiLabelsListAdapter.Label("LABEL_4", "#FF00EB3B", "#FFFFFF"),
+    )
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/base/BaseThreadDetailsGmailApiFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/base/BaseThreadDetailsGmailApiFlowTest.kt
new file mode 100644
index 0000000000..b9978f6cfe
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/base/BaseThreadDetailsGmailApiFlowTest.kt
@@ -0,0 +1,436 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.gmailapi.base
+
+import android.text.format.DateUtils
+import android.text.format.Formatter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.contrib.RecyclerViewActions.scrollTo
+import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withParent
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.web.assertion.WebViewAssertions.webContent
+import androidx.test.espresso.web.matcher.DomMatchers.elementByXPath
+import androidx.test.espresso.web.sugar.Web.onWebView
+import com.flowcrypt.email.R
+import com.flowcrypt.email.TestConstants
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.hasItemAtPosition
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withDrawable
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withEmptyRecyclerView
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withMessageHeaderInfo
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withPgpBadge
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withRecyclerViewItemCount
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withTextContentMatcher
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withViewBackgroundTint
+import com.flowcrypt.email.rules.AddLabelsToDatabaseRule
+import com.flowcrypt.email.rules.FlowCryptMockWebServerRule
+import com.flowcrypt.email.ui.adapter.GmailApiLabelsListAdapter
+import com.flowcrypt.email.ui.adapter.MessageHeadersListAdapter
+import com.flowcrypt.email.ui.adapter.PgpBadgeListAdapter
+import com.flowcrypt.email.ui.base.BaseGmailApiTest
+import com.flowcrypt.email.ui.base.BaseGmailLabelsFlowTest.GmailApiLabelMatcher
+import com.flowcrypt.email.util.DateTimeUtil
+import com.flowcrypt.email.viewaction.ClickOnViewInRecyclerViewItem
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.RecordedRequest
+import org.hamcrest.Matchers.allOf
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.Matchers.not
+import org.junit.Before
+import java.util.concurrent.TimeUnit
+
+/**
+ * @author Denys Bondarenko
+ */
+abstract class BaseThreadDetailsGmailApiFlowTest(
+  accountEntity: AccountEntity = BASE_ACCOUNT_ENTITY.copy(useConversationMode = true)
+) : BaseGmailApiTest(accountEntity) {
+
+  override val mockWebServerRule =
+    FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT, object : Dispatcher() {
+      override fun dispatch(request: RecordedRequest): MockResponse {
+        return when {
+          else -> handleCommonAPICalls(request)
+        }
+      }
+    })
+
+  protected val customLabelsRule = AddLabelsToDatabaseRule(
+    account = accountEntity, folders = CUSTOM_LABELS.map {
+      LocalFolder(
+        account = addAccountToDatabaseRule.account.email,
+        fullName = it.name,
+        folderAlias = it.name,
+        isCustom = true,
+        labelColor = it.backgroundColor,
+        textColor = it.textColor,
+        attributes = listOf("\\HasNoChildren")
+      )
+    }
+  )
+
+  @Before
+  fun waitForThreadsList() {
+    //need to wait while the app loads the thread list
+    waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(20))
+  }
+
+  protected fun checkReplyButtons(isVisible: Boolean = true, isEncryptedMode: Boolean = true) {
+    if (!isVisible) {
+      onView(
+        allOf(
+          withId(R.id.replyButton),
+          withParent(
+            allOf(
+              withId(R.id.layoutReplyButtons),
+              withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
+              hasSibling(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+            )
+          )
+        )
+      ).check(matches(not(isDisplayed())))
+      onView(
+        allOf(
+          withId(R.id.replyAllButton),
+          withParent(
+            allOf(
+              withId(R.id.layoutReplyButtons),
+              withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
+              hasSibling(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+            )
+          )
+        )
+      ).check(matches(not(isDisplayed())))
+      onView(
+        allOf(
+          withId(R.id.forwardButton),
+          withParent(
+            allOf(
+              withId(R.id.layoutReplyButtons),
+              withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
+              hasSibling(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+            )
+          )
+        )
+      ).check(matches(not(isDisplayed())))
+
+      return
+    }
+
+    val tintColor = if (isEncryptedMode) {
+      R.color.colorPrimary
+    } else {
+      R.color.red
+    }
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        scrollTo<ViewHolder>(
+          hasDescendant(
+            allOf(
+              withId(R.id.imageButtonReplyAll),
+              withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
+            )
+          )
+        )
+      )
+    onView(
+      allOf(
+        withId(R.id.replyButton),
+        withParent(allOf(withId(R.id.layoutReplyButtons), isDisplayed()))
+      )
+    ).check(matches(isDisplayed()))
+      .check(matches(withText(getResString(R.string.reply_encrypted.takeIf {
+        isEncryptedMode
+      } ?: R.string.reply))))
+      .check(matches(withDrawable(resId = R.drawable.ic_reply, tintColor = tintColor)))
+
+    onView(
+      allOf(
+        withId(R.id.replyAllButton),
+        withParent(allOf(withId(R.id.layoutReplyButtons), isDisplayed()))
+      )
+    ).check(matches(isDisplayed()))
+      .check(matches(withText(getResString(R.string.reply_all_encrypted.takeIf {
+        isEncryptedMode
+      } ?: R.string.reply_all))))
+      .check(matches(withDrawable(resId = R.drawable.ic_reply_all, tintColor = tintColor)))
+
+    onView(
+      allOf(
+        withId(R.id.forwardButton),
+        withParent(allOf(withId(R.id.layoutReplyButtons), isDisplayed()))
+      )
+    ).check(matches(isDisplayed()))
+      .check(matches(withText(getResString(R.string.forward_encrypted.takeIf {
+        isEncryptedMode
+      } ?: R.string.forward))))
+      .check(matches(withDrawable(resId = R.drawable.ic_forward, tintColor = tintColor)))
+  }
+
+  protected fun checkCorrectThreadDetails(
+    messagesCount: Int,
+    threadSubject: String,
+    labels: List<GmailApiLabelsListAdapter.Label>
+  ) {
+    //check correct messages count
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .check(matches(withRecyclerViewItemCount(messagesCount + 1)))//header + messages
+
+    //check thread subject
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        scrollTo<ViewHolder>(
+          hasDescendant(
+            allOf(
+              withId(R.id.textViewSubject),
+              withText(threadSubject)
+            )
+          )
+        )
+      )
+
+    //check correct labels
+    onView(allOf(withId(R.id.recyclerViewLabels), isDisplayed()))
+      .check(matches(withRecyclerViewItemCount(labels.size)))
+
+    for (label in labels) {
+      onView(allOf(withId(R.id.recyclerViewLabels), isDisplayed()))
+        .perform(scrollToHolder(GmailApiLabelMatcher(label)))
+        .check(
+          matches(
+            hasDescendant(
+              allOf(
+                listOfNotNull(
+                  isDisplayed(),
+                  hasDescendant(withText(label.name)),
+                  label.backgroundColor?.let { backgroundColor ->
+                    withViewBackgroundTint(getTargetContext(), backgroundColor)
+                  }
+                )
+              )
+            )
+          )
+        )
+    }
+  }
+
+  protected fun checkAttachments(pairs: List<Pair<String, Long>>) {
+    if (pairs.isEmpty()) {
+      onView(allOf(withId(R.id.rVAttachments)))
+        .check(matches(withEmptyRecyclerView()))
+      return
+    }
+
+    onView(allOf(withId(R.id.rVAttachments), isDisplayed()))
+      .check(matches(withRecyclerViewItemCount(pairs.size)))
+
+    pairs.forEach { pair ->
+      onView(allOf(withId(R.id.rVAttachments), isDisplayed()))
+        .perform(
+          scrollTo<ViewHolder>(
+            allOf(
+              listOfNotNull(
+                hasDescendant(
+                  allOf(
+                    withId(R.id.textViewAttachmentName),
+                    withText(pair.first)
+                  )
+                ),
+                hasDescendant(
+                  allOf(
+                    withId(R.id.textViewAttSize),
+                    withText(Formatter.formatFileSize(getTargetContext(), pair.second))
+                  )
+                ).takeIf { pair.second > 0 },
+                hasDescendant(withId(R.id.imageButtonPreviewAtt)),
+                hasDescendant(withId(R.id.imageButtonDownloadAtt)),
+              )
+            )
+          )
+        )
+    }
+  }
+
+  protected fun checkPgpBadges(
+    badgeCount: Int,
+    vararg badgeTypes: PgpBadgeListAdapter.PgpBadge.Type
+  ) {
+    onView(allOf(withId(R.id.rVPgpBadges), isDisplayed()))
+      .check(matches(withRecyclerViewItemCount(badgeCount)))
+
+    for (badgeType in badgeTypes) {
+      onView(allOf(withId(R.id.rVPgpBadges), isDisplayed()))
+        .perform(
+          scrollToHolder(
+            withPgpBadge(PgpBadgeListAdapter.PgpBadge(badgeType))
+          )
+        )
+    }
+  }
+
+  protected fun checkWebViewText(content: String?) {
+    onWebView(allOf(withId(R.id.emailWebView), isDisplayed())).forceJavascriptEnabled()
+    onWebView(allOf(withId(R.id.emailWebView), isDisplayed()))
+      .check(webContent(elementByXPath("/html/body", withTextContentMatcher(`is`(content)))))
+  }
+
+  protected fun openThreadBasedOnPosition(position: Int) {
+    onView(allOf(withId(R.id.recyclerViewMsgs), isDisplayed())).perform(
+      RecyclerViewActions.actionOnItemAtPosition<ViewHolder>(position, click())
+    )
+
+    //need to wait while the app loads the messages list and render the last one
+    waitForObjectWithResourceName("imageButtonReplyAll", TimeUnit.SECONDS.toMillis(10))
+  }
+
+  protected fun checkBaseMessageDetailsInTread(
+    fromAddress: String,
+    datetimeInMilliseconds: Long,
+    headersMapTransformation: (Map<String, String>) -> Map<String, String> = { it }
+  ) {
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        scrollTo<ViewHolder>(
+          hasDescendant(
+            allOf(
+              withId(R.id.textViewSenderAddress),
+              withText(fromAddress)
+            )
+          )
+        )
+      )
+
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        scrollTo<ViewHolder>(
+          allOf(
+            hasDescendant(
+              withId(R.id.imageButtonMoreOptions)
+            ),
+            hasDescendant(
+              allOf(
+                withId(R.id.textViewDate),
+                withText(DateTimeUtil.formatSameDayTime(getTargetContext(), datetimeInMilliseconds))
+              )
+            )
+          )
+        )
+      )
+
+    //open headers details and check them
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        RecyclerViewActions.actionOnItem<ViewHolder>(
+          hasDescendant(withId(R.id.iBShowDetails)),
+          ClickOnViewInRecyclerViewItem(R.id.iBShowDetails)
+        )
+      )
+
+    val messageHeadersList = headersMapTransformation.invoke(
+      mapOf(
+        getResString(R.string.from) to DEFAULT_FROM_RECIPIENT,
+        getResString(R.string.reply_to) to DEFAULT_FROM_RECIPIENT,
+        getResString(R.string.to) to EXISTING_MESSAGE_TO_RECIPIENT,
+        getResString(R.string.cc) to EXISTING_MESSAGE_CC_RECIPIENT,
+        getResString(R.string.date) to DateUtils.formatDateTime(
+          getTargetContext(),
+          datetimeInMilliseconds,
+          DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME or DateUtils.FORMAT_SHOW_YEAR
+        )
+      )
+    ).map { MessageHeadersListAdapter.Header(name = it.key, value = it.value) }
+
+    messageHeadersList.forEach {
+      onView(allOf(withId(R.id.rVMsgDetails), isDisplayed()))
+        .perform(scrollToHolder(withMessageHeaderInfo(it)))
+    }
+  }
+
+  protected fun checkCollapsedState(
+    position: Int,
+    hasPgp: Boolean,
+    hasAttachments: Boolean,
+    needToCollapseVisibleExpandedItem: Boolean = true
+  ) {
+    if (needToCollapseVisibleExpandedItem) {
+      collapseVisibleExpandedItem()
+    }
+
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .check(
+        matches(
+          hasItemAtPosition(
+            position = position,
+            matcher = hasDescendant(
+              allOf(
+                withId(R.id.viewHasAttachments),
+                withEffectiveVisibility(
+                  if (hasAttachments) {
+                    ViewMatchers.Visibility.VISIBLE
+                  } else {
+                    ViewMatchers.Visibility.GONE
+                  }
+                )
+              )
+            )
+          )
+        )
+      )
+
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .check(
+        matches(
+          hasItemAtPosition(
+            position = position,
+            matcher = hasDescendant(
+              allOf(
+                withId(R.id.viewHasPgp),
+                withEffectiveVisibility(
+                  if (hasPgp) {
+                    ViewMatchers.Visibility.VISIBLE
+                  } else {
+                    ViewMatchers.Visibility.GONE
+                  }
+                )
+              )
+            )
+          )
+        )
+      )
+  }
+
+  protected fun collapseVisibleExpandedItem() {
+    onView(allOf(withId(R.id.recyclerViewMessages), isDisplayed()))
+      .perform(
+        RecyclerViewActions.actionOnItem<ViewHolder>(
+          hasDescendant(withId(R.id.layoutHeader)),
+          ClickOnViewInRecyclerViewItem(R.id.layoutHeader)
+        )
+      )
+  }
+
+  companion object {
+    val CUSTOM_LABELS = listOf(
+      GmailApiLabelsListAdapter.Label("LABEL_1", "#ff2323ff", "#FFFFFF"),
+      GmailApiLabelsListAdapter.Label("LABEL_2", "#FFD14836", "#FFFFFF"),
+      GmailApiLabelsListAdapter.Label("LABEL_3", "#FFFFEB3B", "#FFFFFF"),
+      GmailApiLabelsListAdapter.Label("LABEL_4", "#FF00EB3B", "#FFFFFF"),
+    )
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/FlowCryptApplication.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/FlowCryptApplication.kt
index 268e2b13da..21499f5606 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/FlowCryptApplication.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/FlowCryptApplication.kt
@@ -8,6 +8,9 @@ package com.flowcrypt.email
 import android.app.Application
 import android.content.Context
 import android.util.Log
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.preference.PreferenceManager
 import androidx.work.Configuration
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -48,6 +51,9 @@ import java.util.concurrent.TimeUnit
  * @author Denys Bondarenko
  */
 class FlowCryptApplication : Application(), Configuration.Provider {
+
+  val appForegroundedObserver = AppForegroundedObserver()
+
   override val workManagerConfiguration: Configuration
     get() = Configuration.Builder()
       .setMinimumLoggingLevel(
@@ -60,6 +66,8 @@ class FlowCryptApplication : Application(), Configuration.Provider {
 
   override fun onCreate() {
     super.onCreate()
+    ProcessLifecycleOwner.get().lifecycle.addObserver(appForegroundedObserver)
+
     setupGlobalSettingsForJavaMail()
     setupPGPainless()
     setupKeysStorage()
@@ -260,4 +268,19 @@ class FlowCryptApplication : Application(), Configuration.Provider {
       }
     }
   }
+
+  class AppForegroundedObserver : DefaultLifecycleObserver {
+    val isAppForegrounded: Boolean
+      get() {
+        return isAppForegroundedInternal
+      }
+    private var isAppForegroundedInternal = false
+    override fun onStart(owner: LifecycleOwner) {
+      isAppForegroundedInternal = true
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+      isAppForegroundedInternal = false
+    }
+  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt
index 0dc3f6f05d..79005596bb 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email
@@ -62,6 +62,7 @@ import jakarta.mail.internet.InternetAddress
 import jakarta.mail.internet.MimeBodyPart
 import jakarta.mail.internet.MimeMessage
 import jakarta.mail.internet.MimeMultipart
+import jakarta.mail.internet.MimeUtility
 import jakarta.mail.search.AndTerm
 import jakarta.mail.search.BodyTerm
 import jakarta.mail.search.FromStringTerm
@@ -615,11 +616,15 @@ class EmailUtil {
       } as HashMap<Long, Boolean>
     }
 
-    fun hasEncryptedData(rawMsg: String?) =
-      rawMsg?.contains("-----BEGIN PGP MESSAGE-----") == true
+    fun hasEncryptedData(rawMsg: String?): Boolean {
+      return "^-----BEGIN PGP MESSAGE-----".toRegex(RegexOption.MULTILINE)
+        .containsMatchIn(rawMsg ?: "")
+    }
 
-    fun hasSignedData(rawMsg: String?) =
-      rawMsg?.contains("-----BEGIN PGP SIGNED MESSAGE-----") == true
+    fun hasSignedData(rawMsg: String?): Boolean {
+      return "^-----BEGIN PGP SIGNED MESSAGE-----".toRegex(RegexOption.MULTILINE)
+        .containsMatchIn(rawMsg ?: "")
+    }
 
     fun genPgpThingsSearchTerm(account: AccountEntity): SearchTerm {
       return if (AccountEntity.ACCOUNT_TYPE_GOOGLE.equals(account.accountType, ignoreCase = true)) {
@@ -689,7 +694,7 @@ class EmailUtil {
       }
 
       return@withContext when (outgoingMsgInfo.messageType) {
-        MessageType.NEW, MessageType.FORWARD, MessageType.DRAFT -> {
+        MessageType.NEW, MessageType.DRAFT -> {
           prepareNewMsg(
             session = session,
             info = outgoingMsgInfo,
@@ -715,6 +720,20 @@ class EmailUtil {
           )
         }
 
+        MessageType.FORWARD -> {
+          prepareForwardedMsg(
+            context = context,
+            accountEntity = accountEntity,
+            session = session,
+            info = outgoingMsgInfo,
+            pubKeys = pubKeys,
+            protectedPubKeys = protectedPubKeys,
+            prvKeys = prvKeys,
+            protector = ringProtector,
+            hideArmorMeta = hideArmorMeta
+          )
+        }
+
         else -> throw IllegalStateException("Unsupported message type")
       }
     }
@@ -1014,6 +1033,65 @@ class EmailUtil {
       return@withContext msg
     }
 
+    private suspend fun prepareForwardedMsg(
+      context: Context,
+      accountEntity: AccountEntity,
+      session: Session,
+      info: OutgoingMessageInfo,
+      pubKeys: List<String>? = null,
+      protectedPubKeys: List<String>? = null,
+      prvKeys: List<String>? = null,
+      protector: SecretKeyRingProtector? = null,
+      hideArmorMeta: Boolean = false,
+    ): MimeMessage = withContext(Dispatchers.IO) {
+      val replyToMimeMessage = getReplyToMimeMessage(context, accountEntity, session, info)
+      return@withContext prepareNewMsg(
+        session = session,
+        info = info,
+        pubKeys = pubKeys,
+        protectedPubKeys = protectedPubKeys,
+        prvKeys = prvKeys,
+        protector = protector,
+        hideArmorMeta = hideArmorMeta
+      ).apply {
+        //based on [MimeMessage.reply()]
+        val msgId = replyToMimeMessage.messageID
+        if (msgId != null) {
+          setHeader(JavaEmailConstants.HEADER_IN_REPLY_TO, msgId)
+        }
+
+        /*
+         * Set the References header as described in RFC 2822:
+         *
+         * The "References:" field will contain the contents of the parent's
+         * "References:" field (if any) followed by the contents of the parent's
+         * "Message-ID:" field (if any).  If the parent message does not contain
+         * a "References:" field but does have an "In-Reply-To:" field
+         * containing a single message identifier, then the "References:" field
+         * will contain the contents of the parent's "In-Reply-To:" field
+         * followed by the contents of the parent's "Message-ID:" field (if
+         * any).  If the parent has none of the "References:", "In-Reply-To:",
+         * or "Message-ID:" fields, then the new message will have no
+         * "References:" field.
+         */
+        var refs = getHeader(JavaEmailConstants.HEADER_REFERENCES, " ")
+        if (refs == null) {
+          // XXX - should only use if it contains a single message identifier
+          refs = getHeader(JavaEmailConstants.HEADER_IN_REPLY_TO, " ")
+        }
+        if (msgId != null) {
+          refs = if (refs != null) {
+            MimeUtility.unfold(refs) + " " + msgId
+          } else {
+            msgId
+          }
+        }
+        if (refs != null) {
+          setHeader(JavaEmailConstants.HEADER_REFERENCES, MimeUtility.fold(12, refs))
+        }
+      }
+    }
+
     fun genReplyMessage(
       replyToMsg: MimeMessage,
       info: OutgoingMessageInfo,
@@ -1162,6 +1240,25 @@ class EmailUtil {
       protector: SecretKeyRingProtector? = null,
       hideArmorMeta: Boolean = false,
     ): Message = withContext(Dispatchers.IO) {
+      val replyToMimeMessage = getReplyToMimeMessage(context, accountEntity, session, info)
+
+      return@withContext genReplyMessage(
+        replyToMsg = replyToMimeMessage,
+        info = info,
+        pubKeys = pubKeys,
+        protectedPubKeys = protectedPubKeys,
+        prvKeys = prvKeys,
+        protector = protector,
+        hideArmorMeta = hideArmorMeta
+      )
+    }
+
+    private suspend fun getReplyToMimeMessage(
+      context: Context,
+      accountEntity: AccountEntity,
+      session: Session,
+      info: OutgoingMessageInfo,
+    ): MimeMessage {
       val replyToMessageEntityId = info.replyToMessageEntityId
         ?: throw IllegalArgumentException("replyToMessageEntityId is null")
 
@@ -1186,16 +1283,7 @@ class EmailUtil {
           Passphrase.fromPassword(accountEntity.servicePgpPassphrase)
         )
       )
-
-      return@withContext genReplyMessage(
-        replyToMsg = FlowCryptMimeMessage(session, decryptionStream),
-        info = info,
-        pubKeys = pubKeys,
-        protectedPubKeys = protectedPubKeys,
-        prvKeys = prvKeys,
-        protector = protector,
-        hideArmorMeta = hideArmorMeta
-      )
+      return FlowCryptMimeMessage(session, decryptionStream)
     }
 
     private fun prepareBodyPart(
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/MsgsCacheManager.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/MsgsCacheManager.kt
index 846709d2c7..d1e9fb0220 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/MsgsCacheManager.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/MsgsCacheManager.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email
@@ -57,6 +57,10 @@ object MsgsCacheManager {
       }
     }
 
+  fun removeMessage(key: String): Boolean {
+    return diskLruCache.remove(key)
+  }
+
   fun getMsgAsByteArray(key: String): ByteArray {
     return diskLruCache[key]?.getByteArray(0) ?: return byteArrayOf()
   }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailApiHelper.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailApiHelper.kt
index 4a14f1730a..4291d32e2d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailApiHelper.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailApiHelper.kt
@@ -1,8 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors:
- *   DenBond7
- *   Ivan Pizhenko
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email.gmail
@@ -15,6 +13,7 @@ import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.api.email.gmail.api.GMailRawAttachmentFilterInputStream
 import com.flowcrypt.email.api.email.gmail.api.GMailRawMIMEMessageFilterInputStream
+import com.flowcrypt.email.api.email.gmail.model.GmailThreadInfo
 import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.api.retrofit.response.base.Result
@@ -22,9 +21,11 @@ import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.AttachmentEntity
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.contentId
-import com.flowcrypt.email.extensions.disposition
-import com.flowcrypt.email.extensions.isMimeType
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.disposition
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.getAttachmentInfoList
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.isMimeType
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.toThreadInfo
+import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
 import com.flowcrypt.email.extensions.uid
 import com.flowcrypt.email.model.KeyImportDetails
 import com.flowcrypt.email.security.model.PgpKeyRingDetails
@@ -41,6 +42,7 @@ import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecovera
 import com.google.api.client.googleapis.json.GoogleJsonError
 import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.client.http.HttpHeaders
+import com.google.api.client.http.HttpTransport
 import com.google.api.client.http.javanet.NetHttpTransport
 import com.google.api.client.json.GenericJson
 import com.google.api.client.json.gson.GsonFactory
@@ -52,8 +54,11 @@ import com.google.api.services.gmail.model.Draft
 import com.google.api.services.gmail.model.History
 import com.google.api.services.gmail.model.Label
 import com.google.api.services.gmail.model.ListMessagesResponse
+import com.google.api.services.gmail.model.ListThreadsResponse
 import com.google.api.services.gmail.model.Message
 import com.google.api.services.gmail.model.MessagePart
+import com.google.api.services.gmail.model.ModifyThreadRequest
+import com.google.api.services.gmail.model.Thread
 import jakarta.mail.Flags
 import jakarta.mail.MessagingException
 import jakarta.mail.Part
@@ -76,6 +81,9 @@ import java.net.ProtocolException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import java.util.Properties
+import java.util.logging.ConsoleHandler
+import java.util.logging.Level
+import java.util.logging.Logger
 import javax.net.ssl.SSLException
 
 /**
@@ -114,8 +122,9 @@ class GmailApiHelper {
     private const val COUNT_OF_LOADED_EMAILS_BY_STEP =
       JavaEmailConstants.COUNT_OF_LOADED_EMAILS_BY_STEP.toLong()
     const val MESSAGE_RESPONSE_FORMAT_RAW = "raw"
-    const val MESSAGE_RESPONSE_FORMAT_FULL = "full"
-    const val MESSAGE_RESPONSE_FORMAT_MINIMAL = "minimal"
+    const val RESPONSE_FORMAT_FULL = "full"
+    const val RESPONSE_FORMAT_MINIMAL = "minimal"
+    const val RESPONSE_FORMAT_METADATA = "metadata"
 
     private val FULL_INFO_WITHOUT_DATA = listOf(
       "id",
@@ -133,6 +142,14 @@ class GmailApiHelper {
       "payload/parts(partId,mimeType,filename,headers,body/size,body/attachmentId)"
     )
 
+    val THREAD_BASE_INFO = listOf(
+      "id",
+      "historyId",
+      "messages/id",
+      "messages/threadId",
+      "messages/labelIds",
+    )
+
     suspend fun <T> executeWithResult(action: suspend () -> Result<T>): Result<T> =
       withContext(Dispatchers.IO) {
         return@withContext try {
@@ -181,12 +198,10 @@ class GmailApiHelper {
       val credential = generateGoogleAccountCredential(context, account)
 
       val transport = NetHttpTransport()
-      /*if (EmailUtil.hasEnabledDebug(context)) {
-        Logger.getLogger(HttpTransport::class.java.name).apply {
-          level = Level.CONFIG
-          addHandler(object : ConsoleHandler() {}.apply { level = Level.CONFIG })
-        }
-      }*/
+      Logger.getLogger(HttpTransport::class.java.name).apply {
+        level = Level.CONFIG
+        addHandler(object : ConsoleHandler() {}.apply { level = Level.CONFIG })
+      }
 
       val factory = GsonFactory.getDefaultInstance()
       val appName = context.getString(R.string.app_name)
@@ -230,21 +245,59 @@ class GmailApiHelper {
     suspend fun getWholeMimeMessageInputStream(
       context: Context,
       account: AccountEntity?,
-      messageEntity: MessageEntity
+      messageId: String
     ): InputStream = withContext(Dispatchers.IO) {
-      val msgId = messageEntity.uidAsHEX
       val gmailApiService = generateGmailApiService(context, account)
 
       val message = gmailApiService
         .users()
         .messages()
-        .get(DEFAULT_USER_ID, msgId)
+        .get(DEFAULT_USER_ID, messageId)
         .setFormat(MESSAGE_RESPONSE_FORMAT_RAW)
       message.fields = "raw"
 
       return@withContext Base64InputStream(GMailRawMIMEMessageFilterInputStream(message.executeAsInputStream()))
     }
 
+    suspend fun loadThreads(
+      context: Context,
+      accountEntity: AccountEntity,
+      localFolder: LocalFolder,
+      maxResult: Long = COUNT_OF_LOADED_EMAILS_BY_STEP,
+      fields: List<String>? = null,
+      nextPageToken: String? = null
+    ): ListThreadsResponse = withContext(Dispatchers.IO) {
+      val gmailApiService = generateGmailApiService(context, accountEntity)
+      val request = gmailApiService
+        .users()
+        .threads()
+        .list(DEFAULT_USER_ID)
+        .setPageToken(nextPageToken)
+        .setMaxResults(maxResult)
+
+      fields?.let { fields ->
+        request.fields = fields.joinToString(separator = ",")
+      }
+
+      if (!localFolder.isAll) {
+        request.labelIds = listOf(localFolder.fullName)
+      }
+
+      if (localFolder.searchQuery.isNullOrEmpty()) {
+        if (accountEntity.showOnlyEncrypted == true) {
+          request.q =
+            (EmailUtil.genPgpThingsSearchTerm(accountEntity) as? GmailRawSearchTerm)?.pattern
+        }
+      } else {
+        request.q = (EmailUtil.generateSearchTerm(
+          accountEntity,
+          localFolder
+        ) as? GmailRawSearchTerm)?.pattern
+      }
+
+      return@withContext request.execute()
+    }
+
     suspend fun loadMsgsBaseInfo(
       context: Context,
       accountEntity: AccountEntity,
@@ -296,7 +349,7 @@ class GmailApiHelper {
       accountEntity: AccountEntity,
       messages: List<Message>,
       localFolder: LocalFolder,
-      format: String = MESSAGE_RESPONSE_FORMAT_FULL,
+      format: String = RESPONSE_FORMAT_FULL,
       stepValue: Int = 10
     ): List<Message> = withContext(Dispatchers.IO)
     {
@@ -305,9 +358,127 @@ class GmailApiHelper {
       }
     }
 
+    suspend fun loadGmailThreadInfoInParallel(
+      context: Context,
+      accountEntity: AccountEntity,
+      threads: List<Thread>,
+      format: String = RESPONSE_FORMAT_FULL,
+      fields: List<String>? = null,
+      stepValue: Int = 10
+    ): List<GmailThreadInfo> = withContext(Dispatchers.IO)
+    {
+      return@withContext useParallel(list = threads, stepValue = stepValue) { list ->
+        loadThreadsInfo(
+          context = context,
+          accountEntity = accountEntity,
+          threads = list,
+          format = format,
+          fields = fields
+        )
+      }
+    }
+
+    suspend fun loadThreadsInfo(
+      context: Context,
+      accountEntity: AccountEntity,
+      threads: Collection<Thread>,
+      format: String = RESPONSE_FORMAT_FULL,
+      metadataHeaders: List<String>? = null,
+      fields: List<String>? = null
+    ): List<GmailThreadInfo> = withContext(Dispatchers.IO)
+    {
+      val gmailApiService = generateGmailApiService(context, accountEntity)
+      val batch = gmailApiService.batch()
+
+      val listResult = mutableListOf<GmailThreadInfo>()
+
+      for (thread in threads) {
+        val request = gmailApiService
+          .users()
+          .threads()
+          .get(DEFAULT_USER_ID, thread.id)
+          .setFormat(format)
+
+        metadataHeaders?.let { metadataHeaders ->
+          request.metadataHeaders = metadataHeaders
+        }
+
+        fields?.let { fields ->
+          request.fields = fields.joinToString(separator = ",")
+        }
+
+        request.queue(
+          batch,
+          object : JsonBatchCallback<Thread>() {
+            override fun onSuccess(
+              t: Thread?,
+              responseHeaders: HttpHeaders?
+            ) {
+              t?.let { thread ->
+                listResult.add(thread.toThreadInfo(context, accountEntity))
+              }
+            }
+
+            override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {
+              IllegalStateException(e?.toPrettyString()).printStackTraceIfDebugOnly()
+            }
+          })
+      }
+
+      batch.execute()
+
+      return@withContext listResult
+    }
+
+    suspend fun loadThreadInfo(
+      context: Context,
+      accountEntity: AccountEntity,
+      threadId: String,
+      format: String = RESPONSE_FORMAT_FULL,
+      metadataHeaders: List<String>? = null,
+      fields: List<String>? = null
+    ): GmailThreadInfo? = withContext(Dispatchers.IO)
+    {
+      return@withContext getThread(
+        context = context,
+        accountEntity = accountEntity,
+        threadId = threadId,
+        format = format,
+        metadataHeaders = metadataHeaders,
+        fields = fields
+      )?.toThreadInfo(context, accountEntity)
+    }
+
+    suspend fun getThread(
+      context: Context,
+      accountEntity: AccountEntity,
+      threadId: String,
+      format: String = RESPONSE_FORMAT_FULL,
+      metadataHeaders: List<String>? = null,
+      fields: List<String>? = null
+    ): Thread? = withContext(Dispatchers.IO) {
+      val gmailApiService = generateGmailApiService(context, accountEntity)
+
+      val request = gmailApiService
+        .users()
+        .threads()
+        .get(DEFAULT_USER_ID, threadId)
+        .setFormat(format)
+
+      metadataHeaders?.let { metadataHeaders ->
+        request.metadataHeaders = metadataHeaders
+      }
+
+      fields?.let { fields ->
+        request.fields = fields.joinToString(separator = ",")
+      }
+
+      return@withContext request.execute()
+    }
+
     suspend fun loadMsgs(
       context: Context, accountEntity: AccountEntity, messages: Collection<Message>,
-      localFolder: LocalFolder, format: String = MESSAGE_RESPONSE_FORMAT_FULL,
+      localFolder: LocalFolder, format: String = RESPONSE_FORMAT_FULL,
       metadataHeaders: List<String>? = null, fields: List<String>? = FULL_INFO_WITHOUT_DATA
     ): List<Message> = withContext(Dispatchers.IO)
     {
@@ -385,6 +556,46 @@ class GmailApiHelper {
         .execute()
     }
 
+    suspend fun changeLabelsForThreads(
+      context: Context,
+      accountEntity: AccountEntity,
+      threadIdList: Collection<String>,
+      addLabelIds: List<String>? = null,
+      removeLabelIds: List<String>? = null
+    ): Map<String, Boolean> = withContext(Dispatchers.IO) {
+      if (addLabelIds == null && removeLabelIds == null) {
+        return@withContext emptyMap<String, Boolean>()
+      }
+
+      val gmailApiService = generateGmailApiService(context, accountEntity)
+      val batch = gmailApiService.batch()
+
+      val resultMap = mutableMapOf<String, Boolean>()
+      threadIdList.forEach { threadId ->
+        val request = gmailApiService
+          .users()
+          .threads()
+          .modify(DEFAULT_USER_ID, threadId, ModifyThreadRequest().apply {
+            this.addLabelIds = addLabelIds
+            this.removeLabelIds = removeLabelIds
+          })
+
+        request.queue(batch, object : JsonBatchCallback<Thread>() {
+          override fun onSuccess(t: Thread?, responseHeaders: HttpHeaders?) {
+            resultMap[threadId] = true
+          }
+
+          override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {
+            resultMap[threadId] = true
+          }
+        })
+      }
+
+      batch.execute()
+
+      return@withContext resultMap
+    }
+
     suspend fun deleteMsgsPermanently(
       context: Context, accountEntity: AccountEntity,
       ids: List<String>
@@ -401,6 +612,33 @@ class GmailApiHelper {
       }
     }
 
+    suspend fun deleteThreadsPermanently(
+      context: Context, accountEntity: AccountEntity,
+      ids: Collection<String>
+    ): Map<String, Boolean> = withContext(Dispatchers.IO) {
+      val gmailApiService = generateGmailApiService(context, accountEntity)
+      val batch = gmailApiService.batch()
+      val resultMap = mutableMapOf<String, Boolean>()
+      ids.forEach { id ->
+        val request = gmailApiService
+          .users()
+          .threads()
+          .delete(DEFAULT_USER_ID, id)
+        request.queue(batch, object : JsonBatchCallback<Void>() {
+          override fun onSuccess(t: Void?, responseHeaders: HttpHeaders?) {
+            resultMap[id] = true
+          }
+
+          override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {
+            resultMap[id] = false
+          }
+        })
+      }
+
+      batch.execute()
+      return@withContext resultMap
+    }
+
     suspend fun deleteDrafts(
       context: Context,
       accountEntity: AccountEntity,
@@ -411,6 +649,7 @@ class GmailApiHelper {
         val gmailApiService = generateGmailApiService(context, accountEntity)
         val batch = gmailApiService.batch()
 
+        val result = mutableListOf<Pair<String, Boolean>>()
         for (id in list) {
           val request = gmailApiService
             .users()
@@ -418,40 +657,79 @@ class GmailApiHelper {
             .delete(DEFAULT_USER_ID, id)
 
           request.queue(batch, object : JsonBatchCallback<Void>() {
-            override fun onSuccess(t: Void?, responseHeaders: HttpHeaders?) {}
-            override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {}
+            override fun onSuccess(t: Void?, responseHeaders: HttpHeaders?) {
+              result.add(Pair(id, true))
+            }
+
+            override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {
+              result.add(Pair(id, false))
+            }
           })
         }
 
         batch.execute()
-        return@useParallel list
-      }
+        return@useParallel result
+      }.associateBy({ it.first }, { it.second })
     }
 
-    suspend fun moveToTrash(context: Context, accountEntity: AccountEntity, ids: List<String>) =
-      withContext(Dispatchers.IO) {
-        val gmailApiService = generateGmailApiService(context, accountEntity)
-        val batch = gmailApiService.batch()
+    suspend fun moveToTrash(
+      context: Context,
+      accountEntity: AccountEntity,
+      ids: List<String>
+    ): Map<String, Boolean> = withContext(Dispatchers.IO) {
+      val gmailApiService = generateGmailApiService(context, accountEntity)
+      val batch = gmailApiService.batch()
+      val resultMap = mutableMapOf<String, Boolean>()
 
-        for (id in ids) {
-          val request = gmailApiService
-            .users()
-            .messages()
-            .trash(DEFAULT_USER_ID, id)
-          request.queue(batch, object : JsonBatchCallback<Message>() {
-            override fun onSuccess(t: Message?, responseHeaders: HttpHeaders?) {
-              //need to think about it
-            }
+      ids.forEach { id ->
+        val request = gmailApiService
+          .users()
+          .messages()
+          .trash(DEFAULT_USER_ID, id)
+        request.queue(batch, object : JsonBatchCallback<Message>() {
+          override fun onSuccess(t: Message?, responseHeaders: HttpHeaders?) {
+            resultMap[id] = true
+          }
 
-            override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {
-              //need to think about it
-            }
-          })
-        }
+          override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {
+            resultMap[id] = false
+          }
+        })
+      }
 
-        batch.execute()
+      batch.execute()
+      return@withContext resultMap
+    }
+
+    suspend fun moveThreadsToTrash(
+      context: Context,
+      accountEntity: AccountEntity,
+      ids: Collection<String>
+    ): Map<String, Boolean> = withContext(Dispatchers.IO) {
+      val gmailApiService = generateGmailApiService(context, accountEntity)
+      val batch = gmailApiService.batch()
+
+      val resultMap = mutableMapOf<String, Boolean>()
+      ids.forEach { id ->
+        val request = gmailApiService
+          .users()
+          .threads()
+          .trash(DEFAULT_USER_ID, id)
+        request.queue(batch, object : JsonBatchCallback<Thread>() {
+          override fun onSuccess(t: Thread?, responseHeaders: HttpHeaders?) {
+            resultMap[id] = true
+          }
+
+          override fun onFailure(e: GoogleJsonError?, responseHeaders: HttpHeaders?) {
+            resultMap[id] = false
+          }
+        })
       }
 
+      batch.execute()
+      return@withContext resultMap
+    }
+
     suspend fun loadTrashMsgs(context: Context, accountEntity: AccountEntity): List<Message> =
       withContext(Dispatchers.IO) {
         val gmailApiService = generateGmailApiService(context, accountEntity)
@@ -492,7 +770,8 @@ class GmailApiHelper {
         .users()
         .history()
         .list(DEFAULT_USER_ID)
-        .setStartHistoryId(historyId).apply {
+        .setStartHistoryId(historyId)
+        .apply {
           if (!localFolder.isAll) {
             labelId = localFolder.fullName
           }
@@ -531,102 +810,6 @@ class GmailApiHelper {
       return@withContext historyList
     }
 
-    suspend fun processHistory(
-      localFolder: LocalFolder,
-      historyList: List<History>,
-      action: suspend (
-        deleteCandidatesUIDs: Set<Long>,
-        newCandidatesMap: Map<Long, Message>,
-        updateCandidatesMap: Map<Long, Flags>,
-        labelsToBeUpdatedMap: Map<Long, String>
-      ) -> Unit
-    ) = withContext(Dispatchers.IO)
-    {
-      val deleteCandidatesUIDs = mutableSetOf<Long>()
-      val newCandidatesMap = mutableMapOf<Long, Message>()
-      val updateCandidates = mutableMapOf<Long, Flags>()
-      val labelsToBeUpdatedMap = mutableMapOf<Long, String>()
-      val isDrafts = localFolder.isDrafts
-
-      for (history in historyList) {
-        history.messagesDeleted?.let { messagesDeleted ->
-          for (historyMsgDeleted in messagesDeleted) {
-            newCandidatesMap.remove(historyMsgDeleted.message.uid)
-            updateCandidates.remove(historyMsgDeleted.message.uid)
-            deleteCandidatesUIDs.add(historyMsgDeleted.message.uid)
-          }
-        }
-
-        history.messagesAdded?.let { messagesAdded ->
-          for (historyMsgAdded in messagesAdded) {
-            if (LABEL_DRAFT in (historyMsgAdded.message.labelIds ?: emptyList()) && !isDrafts) {
-              //skip adding drafts to non-Drafts folder
-              continue
-            }
-            deleteCandidatesUIDs.remove(historyMsgAdded.message.uid)
-            updateCandidates.remove(historyMsgAdded.message.uid)
-            newCandidatesMap[historyMsgAdded.message.uid] = historyMsgAdded.message
-          }
-        }
-
-        history.labelsRemoved?.let { labelsRemoved ->
-          for (historyLabelRemoved in labelsRemoved) {
-            val historyMessageLabelIds = historyLabelRemoved?.message?.labelIds ?: emptyList()
-            labelsToBeUpdatedMap[historyLabelRemoved.message.uid] =
-              historyMessageLabelIds.joinToString(MessageEntity.LABEL_IDS_SEPARATOR)
-            if (localFolder.fullName in (historyLabelRemoved.labelIds ?: emptyList())) {
-              newCandidatesMap.remove(historyLabelRemoved.message.uid)
-              updateCandidates.remove(historyLabelRemoved.message.uid)
-              deleteCandidatesUIDs.add(historyLabelRemoved.message.uid)
-              continue
-            }
-
-            if (LABEL_TRASH in (historyLabelRemoved.labelIds ?: emptyList())) {
-              val message = historyLabelRemoved.message
-              if (localFolder.fullName in historyMessageLabelIds) {
-                deleteCandidatesUIDs.remove(message.uid)
-                updateCandidates.remove(message.uid)
-                newCandidatesMap[message.uid] = message
-                continue
-              }
-            }
-
-            val existedFlags = labelsToImapFlags(historyMessageLabelIds)
-            updateCandidates[historyLabelRemoved.message.uid] = existedFlags
-          }
-        }
-
-        history.labelsAdded?.let { labelsAdded ->
-          for (historyLabelAdded in labelsAdded) {
-            labelsToBeUpdatedMap[historyLabelAdded.message.uid] = historyLabelAdded.message
-              .labelIds.joinToString(MessageEntity.LABEL_IDS_SEPARATOR)
-            if (localFolder.fullName in (historyLabelAdded.labelIds ?: emptyList())) {
-              deleteCandidatesUIDs.remove(historyLabelAdded.message.uid)
-              updateCandidates.remove(historyLabelAdded.message.uid)
-              newCandidatesMap[historyLabelAdded.message.uid] = historyLabelAdded.message
-              continue
-            }
-
-            if ((historyLabelAdded.labelIds ?: emptyList()).contains(LABEL_TRASH)) {
-              newCandidatesMap.remove(historyLabelAdded.message.uid)
-              updateCandidates.remove(historyLabelAdded.message.uid)
-              deleteCandidatesUIDs.add(historyLabelAdded.message.uid)
-              continue
-            }
-
-            val existedFlags = labelsToImapFlags(historyLabelAdded.message.labelIds ?: emptyList())
-            updateCandidates[historyLabelAdded.message.uid] = existedFlags
-          }
-        }
-      }
-      action.invoke(
-        deleteCandidatesUIDs,
-        newCandidatesMap,
-        updateCandidates,
-        labelsToBeUpdatedMap
-      )
-    }
-
     suspend fun identifyAttachments(
       msgEntities: List<MessageEntity>, msgs: List<Message>,
       account: AccountEntity, localFolder: LocalFolder, roomDatabase: FlowCryptRoomDatabase
@@ -636,13 +819,14 @@ class GmailApiHelper {
       for (msg in msgs) {
         try {
           if (msg.uid in savedMsgUIDsSet) {
-            attachments.addAll(getAttsInfoFromMessagePart(msg.payload).mapNotNull { attachmentInfo ->
+            attachments.addAll(msg.payload.getAttachmentInfoList().mapNotNull { attachmentInfo ->
               AttachmentEntity.fromAttInfo(
-                attachmentInfo.copy(
+                attachmentInfo = attachmentInfo.copy(
                   email = account.email,
                   folder = localFolder.fullName,
                   uid = msg.uid
-                )
+                ),
+                accountType = account.accountType
               )
             })
           }
@@ -830,41 +1014,6 @@ class GmailApiHelper {
         .execute()
     }
 
-    /**
-     * Get information about attachments from the given [MessagePart]
-     *
-     * @param depth          The depth of the given [MessagePart]
-     * @param messagePart    The given [MessagePart]
-     * @return a list of found attachments
-     */
-    fun getAttsInfoFromMessagePart(
-      messagePart: MessagePart,
-      depth: String = "0"
-    ): MutableList<AttachmentInfo> {
-      val attachmentInfoList = mutableListOf<AttachmentInfo>()
-      if (messagePart.isMimeType(JavaEmailConstants.MIME_TYPE_MULTIPART)) {
-        for ((index, part) in (messagePart.parts ?: emptyList()).withIndex()) {
-          attachmentInfoList.addAll(
-            getAttsInfoFromMessagePart(
-              part,
-              "$depth${AttachmentInfo.DEPTH_SEPARATOR}${index}"
-            )
-          )
-        }
-      } else if (Part.ATTACHMENT.equals(messagePart.disposition(), ignoreCase = true)) {
-        val attachmentInfoBuilder = AttachmentInfo.Builder()
-        attachmentInfoBuilder.name = messagePart.filename ?: depth
-        attachmentInfoBuilder.encodedSize = messagePart.body?.getSize()?.toLong() ?: 0
-        attachmentInfoBuilder.type = messagePart.mimeType ?: ""
-        attachmentInfoBuilder.id = messagePart.contentId()
-          ?: EmailUtil.generateContentId(AttachmentInfo.INNER_ATTACHMENT_PREFIX)
-        attachmentInfoBuilder.path = depth
-        attachmentInfoList.add(attachmentInfoBuilder.build())
-      }
-
-      return attachmentInfoList
-    }
-
     /**
      * Get [Part] which has an attachment with the given attachment path.
      *
@@ -1055,7 +1204,7 @@ class GmailApiHelper {
         request.fields = fields.joinToString(separator = ",")
       }
 
-      return@withContext request.execute().drafts ?: emptyList()
+      return@withContext request.execute()?.drafts ?: emptyList()
     }
 
     /**
@@ -1073,7 +1222,7 @@ class GmailApiHelper {
         .setSelectedAccount(account)
     }
 
-    private fun labelsToImapFlags(labelIds: List<String>): Flags {
+    fun labelsToImapFlags(labelIds: Collection<String>): Flags {
       val flags = Flags()
       labelIds.forEach {
         when (it) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailHistoryHandler.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailHistoryHandler.kt
new file mode 100644
index 0000000000..bdcdfdc2e7
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/GmailHistoryHandler.kt
@@ -0,0 +1,445 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.api.email.gmail
+
+import android.content.Context
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.FoldersManager
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper.Companion.LABEL_DRAFT
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper.Companion.LABEL_TRASH
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper.Companion.labelsToImapFlags
+import com.flowcrypt.email.api.email.gmail.api.GmaiAPIMimeMessage
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.database.FlowCryptRoomDatabase
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.database.entity.MessageEntity.Companion.LABEL_IDS_SEPARATOR
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.hasPgp
+import com.flowcrypt.email.extensions.isAppForegrounded
+import com.flowcrypt.email.extensions.kotlin.toHex
+import com.flowcrypt.email.extensions.kotlin.toLongRadix16
+import com.flowcrypt.email.extensions.uid
+import com.flowcrypt.email.service.MessagesNotificationManager
+import com.flowcrypt.email.util.GeneralUtil
+import com.google.api.services.gmail.model.History
+import com.google.api.services.gmail.model.Message
+import com.google.api.services.gmail.model.Thread
+import jakarta.mail.Flags
+import jakarta.mail.Session
+import jakarta.mail.internet.InternetAddress
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.util.Properties
+
+/**
+ * @author Denys Bondarenko
+ */
+object GmailHistoryHandler {
+  suspend fun handleHistory(
+    context: Context,
+    accountEntity: AccountEntity,
+    localFolder: LocalFolder,
+    historyList: List<History>,
+    action: suspend (
+      deleteCandidates: Map<Long, String>,
+      newCandidatesMap: Map<Long, Message>,
+      updateCandidatesMap: Map<Long, Pair<String, Flags>>,
+      labelsToBeUpdatedMap: Map<Long, Pair<String, String>>
+    ) -> Unit = { _, _, _, _ -> }
+  ) = withContext(Dispatchers.IO) {
+    processHistory(accountEntity, localFolder, historyList) { deleteCandidates,
+                                               newCandidatesMap,
+                                               updateCandidatesMap,
+                                               labelsToBeUpdatedMap ->
+      val applicationContext = context.applicationContext
+      if (accountEntity.useConversationMode) {
+        handleHistoryForConversationMode(
+          context = applicationContext,
+          accountEntity = accountEntity,
+          localFolder = localFolder,
+          deleteCandidates = deleteCandidates,
+          newCandidatesMap = newCandidatesMap,
+          updateCandidatesMap = updateCandidatesMap,
+          labelsToBeUpdatedMap = labelsToBeUpdatedMap
+        )
+      } else {
+        handleHistoryForSeparateMessagesMode(
+          context = applicationContext,
+          accountEntity = accountEntity,
+          localFolder = localFolder,
+          deleteCandidates = deleteCandidates,
+          newCandidatesMap = newCandidatesMap,
+          updateCandidatesMap = updateCandidatesMap,
+          labelsToBeUpdatedMap = labelsToBeUpdatedMap
+        )
+      }
+
+      action.invoke(
+        deleteCandidates,
+        newCandidatesMap,
+        updateCandidatesMap,
+        labelsToBeUpdatedMap
+      )
+    }
+  }
+
+  private suspend fun handleHistoryForConversationMode(
+    context: Context,
+    accountEntity: AccountEntity,
+    localFolder: LocalFolder,
+    deleteCandidates: Map<Long, String>,
+    newCandidatesMap: Map<Long, Message>,
+    updateCandidatesMap: Map<Long, Pair<String, Flags>>,
+    labelsToBeUpdatedMap: Map<Long, Pair<String, String>>
+  ) {
+    val roomDatabase = FlowCryptRoomDatabase.getDatabase(context)
+    val folderType = FoldersManager.getFolderType(localFolder)
+    val threadIds = mutableSetOf<String>().apply {
+      addAll(deleteCandidates.values.toSet())
+      addAll(updateCandidatesMap.entries.map { it.value.first }.toSet())
+      addAll(labelsToBeUpdatedMap.entries.map { it.value.first }.toSet())
+    }
+
+    val gmailThreadsListWithBaseInfo = GmailApiHelper.loadGmailThreadInfoInParallel(
+      context = context,
+      accountEntity = accountEntity,
+      threads = threadIds.map { Thread().apply { id = it } },
+      format = GmailApiHelper.RESPONSE_FORMAT_FULL,
+      fields = GmailApiHelper.THREAD_BASE_INFO
+    )
+
+    val threadIdListToBeUpdated = mutableSetOf<String>()
+
+    //delete remotely trashed threads locally
+    if (deleteCandidates.isNotEmpty()) {
+      val threadIdsToBeDeleted = deleteCandidates.values.toSet()
+      val gmailThreadInfoList =
+        gmailThreadsListWithBaseInfo.filter { it.id in threadIdsToBeDeleted }
+
+      /*
+      Delete threads from the active folder if all messages in a tread doesn't have
+      the requested label.
+      It will cover a situation when some email client works with separate messages.
+      */
+      val toBeDeletedLocally =
+        gmailThreadInfoList.filter { !it.labels.contains(localFolder.fullName) }.toSet()
+
+      roomDatabase.msgDao().deleteByUIDsSuspend(
+        account = accountEntity.email,
+        label = localFolder.fullName,
+        msgsUID = toBeDeletedLocally.map { Long.MAX_VALUE - it.id.toLongRadix16 })
+
+      //need to update the left threads
+      val toBeUpdated = gmailThreadInfoList - toBeDeletedLocally
+      threadIdListToBeUpdated.addAll(toBeUpdated.map { it.id })
+    }
+
+    //insert new threads or update the existing
+    val newCandidates = newCandidatesMap.values
+    if (newCandidates.isNotEmpty() || threadIdListToBeUpdated.isNotEmpty()) {
+      val uniqueThreadIdList = newCandidates.map { it.threadId }.toSet() + threadIdListToBeUpdated
+      val existingThreads = roomDatabase.msgDao().getMsgsByUIDs(
+        account = accountEntity.email,
+        label = localFolder.fullName,
+        uidList = uniqueThreadIdList.map { Long.MAX_VALUE - it.toLongRadix16 })
+      val existingThreadIds = existingThreads.mapNotNull { it.threadIdAsHEX }.toSet()
+
+      val gmailThreadInfoList = GmailApiHelper.loadGmailThreadInfoInParallel(
+        context = context,
+        accountEntity = accountEntity,
+        threads = uniqueThreadIdList.map { Thread().apply { id = it } },
+        format = GmailApiHelper.RESPONSE_FORMAT_FULL
+      )
+
+      val threadsToBeAdded = gmailThreadInfoList
+        .filter { it.id !in existingThreadIds }
+        .map { it.lastMessage }
+
+      if (threadsToBeAdded.isNotEmpty()) {
+        //insert new threads
+        val isNew =
+          !context.isAppForegrounded() && folderType == FoldersManager.FolderType.INBOX
+
+        val msgEntities = MessageEntity.genMessageEntities(
+          context = context,
+          account = accountEntity.email,
+          accountType = accountEntity.accountType,
+          label = localFolder.fullName,
+          msgsList = threadsToBeAdded,
+          isNew = isNew,
+          onlyPgpModeEnabled = accountEntity.showOnlyEncrypted ?: false
+        ) { message, messageEntity ->
+          val thread = gmailThreadInfoList.firstOrNull { it.id == message.threadId }
+            ?: return@genMessageEntities messageEntity
+          messageEntity.copy(
+            uid = Long.MAX_VALUE - thread.id.toLongRadix16,
+            subject = thread.subject,
+            threadMessagesCount = thread.messagesCount,
+            threadDraftsCount = thread.draftsCount,
+            labelIds = thread.labels.joinToString(separator = LABEL_IDS_SEPARATOR),
+            hasAttachments = thread.hasAttachments,
+            fromAddresses = InternetAddress.toString(thread.recipients.toTypedArray()),
+            hasPgp = thread.hasPgpThings
+          )
+        }
+        roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
+      }
+
+      if (existingThreads.isNotEmpty()) {
+        //update existing threads
+        val threadsToBeUpdated = existingThreads.mapNotNull { threadMessageEntity ->
+          gmailThreadInfoList.firstOrNull {
+            it.id == threadMessageEntity.threadIdAsHEX
+          }?.let { thread ->
+            val isNew = !context.isAppForegrounded()
+                && folderType == FoldersManager.FolderType.INBOX
+                && thread.id !in threadIdListToBeUpdated
+
+            MessageEntity.genMessageEntities(
+              context = context,
+              account = accountEntity.email,
+              accountType = accountEntity.accountType,
+              label = localFolder.fullName,
+              msgsList = listOf(thread.lastMessage),
+              isNew = isNew,
+              onlyPgpModeEnabled = accountEntity.showOnlyEncrypted ?: false
+            ) { message, messageEntity ->
+              if (message.threadId == thread.id) {
+                messageEntity.toUpdatedThreadCopy(threadMessageEntity, thread)
+              } else messageEntity
+            }
+          }
+        }
+        roomDatabase.msgDao().updateSuspend(threadsToBeUpdated.flatten())
+      }
+    }
+
+    //update 'unread' state
+    if (updateCandidatesMap.isNotEmpty()) {
+      val threadIdsToBeUpdated = updateCandidatesMap.entries.map { it.value.first }.toSet()
+      val gmailThreadInfoList =
+        gmailThreadsListWithBaseInfo.filter { it.id in threadIdsToBeUpdated }
+
+      val flagsMap = gmailThreadInfoList.associateBy(
+        { Long.MAX_VALUE - it.id.toLongRadix16 },
+        { labelsToImapFlags(it.labels) })
+
+      roomDatabase.msgDao()
+        .updateFlagsSuspend(accountEntity.email, localFolder.fullName, flagsMap)
+    }
+
+    //update 'labels'
+    if (labelsToBeUpdatedMap.isNotEmpty()) {
+      val threadIdsToBeUpdated = labelsToBeUpdatedMap.entries.map { it.value.first }.toSet()
+      val gmailThreadInfoList =
+        gmailThreadsListWithBaseInfo.filter { it.id in threadIdsToBeUpdated }
+      val labelsMap = gmailThreadInfoList.associateBy(
+        { Long.MAX_VALUE - it.id.toLongRadix16 },
+        { it.labels.joinToString(separator = LABEL_IDS_SEPARATOR) })
+
+      roomDatabase.msgDao()
+        .updateGmailLabels(accountEntity.email, localFolder.fullName, labelsMap)
+    }
+  }
+
+  private suspend fun handleHistoryForSeparateMessagesMode(
+    context: Context,
+    accountEntity: AccountEntity,
+    localFolder: LocalFolder,
+    deleteCandidates: Map<Long, String>,
+    newCandidatesMap: Map<Long, Message>,
+    updateCandidatesMap: Map<Long, Pair<String, Flags>>,
+    labelsToBeUpdatedMap: Map<Long, Pair<String, String>>
+  ) {
+    val roomDatabase = FlowCryptRoomDatabase.getDatabase(context)
+    val folderType = FoldersManager.getFolderType(localFolder)
+    roomDatabase.msgDao()
+      .deleteByUIDsSuspend(accountEntity.email, localFolder.fullName, deleteCandidates.keys)
+
+    if (folderType == FoldersManager.FolderType.INBOX) {
+      val notificationManager = MessagesNotificationManager(context)
+      for (entry in deleteCandidates) {
+        notificationManager.cancel(entry.key.toHex())
+      }
+    }
+
+    val newCandidates = newCandidatesMap.values
+    if (newCandidates.isNotEmpty()) {
+      val messages = GmailApiHelper.loadMsgsInParallel(
+        context, accountEntity,
+        newCandidates.toList(), localFolder
+      ).run {
+        if (accountEntity.showOnlyEncrypted == true) {
+          filter { it.hasPgp() }
+        } else this
+      }
+
+      val draftIdsMap = if (localFolder.isDrafts) {
+        val drafts =
+          GmailApiHelper.loadBaseDraftInfoInParallel(context, accountEntity, messages)
+        val fetchedDraftIdsMap = drafts.associateBy({ it.message.id }, { it.id })
+        if (fetchedDraftIdsMap.size != messages.size) {
+          throw IllegalStateException(
+            context.getString(R.string.fetching_drafts_info_failed)
+          )
+        }
+        fetchedDraftIdsMap
+      } else emptyMap()
+
+      val isNew =
+        !context.isAppForegrounded() && folderType == FoldersManager.FolderType.INBOX
+
+      val msgEntities = MessageEntity.genMessageEntities(
+        context = context,
+        account = accountEntity.email,
+        accountType = accountEntity.accountType,
+        label = localFolder.fullName,
+        msgsList = messages,
+        isNew = isNew,
+        onlyPgpModeEnabled = accountEntity.showOnlyEncrypted ?: false,
+        draftIdsMap = draftIdsMap
+      )
+
+      roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
+      GmailApiHelper.identifyAttachments(
+        msgEntities = msgEntities,
+        msgs = messages,
+        account = accountEntity,
+        localFolder = localFolder,
+        roomDatabase = roomDatabase
+      )
+    }
+
+    roomDatabase.msgDao()
+      .updateFlagsSuspend(
+        accountEntity.email,
+        localFolder.fullName,
+        updateCandidatesMap.entries.associate { it.key to it.value.second })
+
+    roomDatabase.msgDao()
+      .updateGmailLabels(
+        accountEntity.email,
+        localFolder.fullName,
+        labelsToBeUpdatedMap.entries.associate { it.key to it.value.second })
+
+    if (folderType == FoldersManager.FolderType.SENT) {
+      val session = Session.getInstance(Properties())
+      GeneralUtil.updateLocalContactsIfNeeded(
+        context = context,
+        messages = newCandidates
+          .filter { it.labelIds?.contains(GmailApiHelper.LABEL_SENT) == true }
+          .map { GmaiAPIMimeMessage(session, it) }.toTypedArray()
+      )
+    }
+  }
+
+  private suspend fun processHistory(
+    accountEntity: AccountEntity,
+    localFolder: LocalFolder,
+    historyList: List<History>,
+    action: suspend (
+      deleteCandidates: Map<Long, String>,
+      newCandidatesMap: Map<Long, Message>,
+      updateCandidatesMap: Map<Long, Pair<String, Flags>>,
+      labelsToBeUpdatedMap: Map<Long, Pair<String, String>>
+    ) -> Unit
+  ) = withContext(Dispatchers.IO)
+  {
+    val deleteCandidates = mutableMapOf<Long, String>()
+    val newCandidatesMap = mutableMapOf<Long, Message>()
+    val updateCandidates = mutableMapOf<Long, Pair<String, Flags>>()
+    val labelsToBeUpdatedMap = mutableMapOf<Long, Pair<String, String>>()
+
+    for (history in historyList) {
+      history.messagesDeleted?.let { messagesDeleted ->
+        for (historyMsgDeleted in messagesDeleted) {
+          newCandidatesMap.remove(historyMsgDeleted.message.uid)
+          updateCandidates.remove(historyMsgDeleted.message.uid)
+          deleteCandidates[historyMsgDeleted.message.uid] = historyMsgDeleted.message.threadId
+        }
+      }
+
+      history.messagesAdded?.let { messagesAdded ->
+        for (historyMsgAdded in messagesAdded) {
+          if (!accountEntity.useConversationMode) {
+            if (LABEL_DRAFT in (historyMsgAdded.message.labelIds
+                ?: emptyList()) && !localFolder.isDrafts
+            ) {
+              //skip adding drafts to non-Drafts folder
+              continue
+            }
+          }
+          deleteCandidates.remove(historyMsgAdded.message.uid)
+          updateCandidates.remove(historyMsgAdded.message.uid)
+          newCandidatesMap[historyMsgAdded.message.uid] = historyMsgAdded.message
+        }
+      }
+
+      history.labelsRemoved?.let { labelsRemoved ->
+        for (historyLabelRemoved in labelsRemoved) {
+          val historyMessageLabelIds = historyLabelRemoved?.message?.labelIds ?: emptyList()
+          labelsToBeUpdatedMap[historyLabelRemoved.message.uid] = Pair(
+            historyLabelRemoved.message.threadId,
+            historyMessageLabelIds.joinToString(LABEL_IDS_SEPARATOR)
+          )
+
+          if (localFolder.fullName in (historyLabelRemoved.labelIds ?: emptyList())) {
+            newCandidatesMap.remove(historyLabelRemoved.message.uid)
+            updateCandidates.remove(historyLabelRemoved.message.uid)
+            deleteCandidates[historyLabelRemoved.message.uid] = historyLabelRemoved.message.threadId
+            continue
+          }
+
+          if (LABEL_TRASH in (historyLabelRemoved.labelIds ?: emptyList())) {
+            val message = historyLabelRemoved.message
+            if (localFolder.fullName in historyMessageLabelIds) {
+              deleteCandidates.remove(message.uid)
+              updateCandidates.remove(message.uid)
+              newCandidatesMap[message.uid] = message
+              continue
+            }
+          }
+
+          val existedFlags = labelsToImapFlags(historyMessageLabelIds)
+          updateCandidates[historyLabelRemoved.message.uid] =
+            Pair(historyLabelRemoved.message.threadId, existedFlags)
+        }
+      }
+
+      history.labelsAdded?.let { labelsAdded ->
+        for (historyLabelAdded in labelsAdded) {
+          labelsToBeUpdatedMap[historyLabelAdded.message.uid] = Pair(
+            historyLabelAdded.message.threadId,
+            historyLabelAdded.message.labelIds.joinToString(LABEL_IDS_SEPARATOR)
+          )
+          if (localFolder.fullName in (historyLabelAdded.labelIds ?: emptyList())) {
+            deleteCandidates.remove(historyLabelAdded.message.uid)
+            updateCandidates.remove(historyLabelAdded.message.uid)
+            newCandidatesMap[historyLabelAdded.message.uid] = historyLabelAdded.message
+            continue
+          }
+
+          if ((historyLabelAdded.labelIds ?: emptyList()).contains(LABEL_TRASH)) {
+            newCandidatesMap.remove(historyLabelAdded.message.uid)
+            updateCandidates.remove(historyLabelAdded.message.uid)
+            deleteCandidates[historyLabelAdded.message.uid] = historyLabelAdded.message.threadId
+            continue
+          }
+
+          val existedFlags = labelsToImapFlags(historyLabelAdded.message.labelIds ?: emptyList())
+          updateCandidates[historyLabelAdded.message.uid] =
+            Pair(historyLabelAdded.message.threadId, existedFlags)
+        }
+      }
+    }
+    action.invoke(
+      deleteCandidates,
+      newCandidatesMap,
+      updateCandidates,
+      labelsToBeUpdatedMap
+    )
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/api/GmaiAPIMimeMessage.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/api/GmaiAPIMimeMessage.kt
index 797a477fc9..ce521ca42c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/api/GmaiAPIMimeMessage.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/api/GmaiAPIMimeMessage.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email.gmail.api
@@ -12,8 +12,8 @@ import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.api.email.javamail.CustomMimeBodyPart
 import com.flowcrypt.email.api.email.javamail.CustomMimeMultipart
 import com.flowcrypt.email.database.entity.AccountEntity
-import com.flowcrypt.email.extensions.isMimeType
-import com.flowcrypt.email.extensions.rawMimeType
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.isMimeType
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.rawMimeType
 import com.google.api.services.gmail.model.Message
 import com.google.api.services.gmail.model.MessagePart
 import jakarta.mail.Flags
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/model/GmailThreadInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/model/GmailThreadInfo.kt
new file mode 100644
index 0000000000..11e182fac8
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/gmail/model/GmailThreadInfo.kt
@@ -0,0 +1,25 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.api.email.gmail.model
+
+import com.google.api.services.gmail.model.Message
+import jakarta.mail.internet.InternetAddress
+
+/**
+ * @author Denys Bondarenko
+ */
+data class GmailThreadInfo(
+  val id: String,
+  val lastMessage: Message,
+  val messagesCount: Int,
+  val draftsCount: Int,
+  val recipients: List<InternetAddress>,
+  val subject: String,
+  val labels: Set<String>,
+  val hasAttachments: Boolean = false,
+  val hasPgpThings: Boolean = false,
+  val hasUnreadMessages: Boolean = false,
+)
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt
index 5d1cbb1329..0fde65ebe0 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt
@@ -1,23 +1,21 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email.model
 
 import android.net.Uri
 import android.os.Parcelable
-import android.webkit.MimeTypeMap
 import com.flowcrypt.email.Constants
-import com.flowcrypt.email.core.msg.RawBlockParser
 import com.flowcrypt.email.extensions.kotlin.asContentTypeOrNull
+import com.flowcrypt.email.extensions.kotlin.getPossibleAndroidMimeType
 import com.flowcrypt.email.providers.EmbeddedAttachmentsProvider
 import com.flowcrypt.email.security.SecurityUtils
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import org.apache.commons.io.FilenameUtils
 
 /**
  * Simple POJO which defines information about email attachments.
@@ -56,7 +54,7 @@ data class AttachmentInfo(
   )
 
   @IgnoredOnParcel
-  val isPossiblyEncrypted = RawBlockParser.ENCRYPTED_FILE_REGEX.containsMatchIn(name ?: "")
+  val isPossiblyEncrypted = SecurityUtils.isPossiblyEncryptedData(name ?: "")
 
   @IgnoredOnParcel
   val uniqueStringId: String
@@ -118,7 +116,7 @@ data class AttachmentInfo(
   }
 
   fun getAndroidMimeType(): String? {
-    return MimeTypeMap.getSingleton().getMimeTypeFromExtension(FilenameUtils.getExtension(name))
+    return name.getPossibleAndroidMimeType()
   }
 
   fun isHidden() = when {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt
index 404eef3e1c..3a62ec75b5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email.model
@@ -26,7 +26,7 @@ import java.util.regex.Pattern
  * @author Denys Bondarenko
  */
 @Parcelize
-data class IncomingMessageInfo constructor(
+data class IncomingMessageInfo(
   val msgEntity: MessageEntity,
   val localFolder: LocalFolder,
   val text: String? = null,
@@ -42,7 +42,7 @@ data class IncomingMessageInfo constructor(
   fun getReplyTo(): List<InternetAddress> = msgEntity.replyToAddress
 
   fun getReplyToWithoutOwnerAddress(): List<InternetAddress> = getReplyTo().filter {
-    !it.address.equals(msgEntity.email, true)
+    !it.address.equals(msgEntity.account, true)
   }
 
   fun getReceiveDate(): Date = Date(msgEntity.receivedDate ?: 0)
@@ -97,7 +97,7 @@ data class IncomingMessageInfo constructor(
             //remove all addresses that To has
             ccSet.removeAll(toRecipients.toSet())
             //remove aliases as Gmail does and the owner address
-            val fromAddress = msgEntity.email
+            val fromAddress = msgEntity.account
             ccSet.removeAll { internetAddress ->
               aliases.any { alias -> internetAddress.address.equals(alias, ignoreCase = true) }
                   || fromAddress.equals(internetAddress.address, true)
@@ -148,6 +148,20 @@ data class IncomingMessageInfo constructor(
     )
   }
 
+  fun toReplyVersion(context: Context, maxContentSize: Int): IncomingMessageInfo {
+    return copy(msgBlocks = emptyList(), text = clipLargeText(context, text, maxContentSize))
+  }
+
+  private fun clipLargeText(context: Context, text: String?, maxContentSize: Int): String? {
+    return when {
+      (text?.length ?: 0) > maxContentSize -> {
+        text?.take(maxContentSize) + "\n\n" + context.getString(R.string.clipped_message_too_large)
+      }
+
+      else -> text
+    }
+  }
+
   private fun prepareRecipientsLineForForwarding(recipients: List<InternetAddress>?): String {
     return recipients?.joinToString { it.toString() } ?: ""
   }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
index a1cb85c747..f42421d64d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email.model
@@ -25,6 +25,7 @@ import java.util.UUID
 @Parcelize
 data class OutgoingMessageInfo(
   @Expose val account: String? = null,
+  @Expose val accountType: String? = null,
   @Expose val subject: String? = null,
   @Expose val msg: String? = null,
   @Expose val toRecipients: List<InternetAddress>? = null,
@@ -36,11 +37,13 @@ data class OutgoingMessageInfo(
   @Expose val encryptionType: MessageEncryptionType? = null,
   @Expose @MessageType val messageType: Int = MessageType.NEW,
   @Expose val replyToMessageEntityId: Long? = null,
-  @Expose val uid: Long = 0,
+  @Expose val uid: Long = System.currentTimeMillis(),
   @Expose val password: CharArray? = null,
   @Expose val timestamp: Long = System.currentTimeMillis(),
   @Expose val signature: String? = null,
   @Expose val quotedTextForReply: String? = null,
+  @Expose val draftId: String? = null,
+  @Expose val draftThreadId: Long? = null,
 ) : Parcelable {
 
   @IgnoredOnParcel
@@ -88,6 +91,8 @@ data class OutgoingMessageInfo(
     if (timestamp != other.timestamp) return false
     if (signature != other.signature) return false
     if (quotedTextForReply != other.quotedTextForReply) return false
+    if (draftId != other.draftId) return false
+    if (draftThreadId != other.draftThreadId) return false
     return true
   }
 
@@ -109,6 +114,8 @@ data class OutgoingMessageInfo(
     result = 31 * result + timestamp.hashCode()
     result = 31 * result + (signature?.hashCode() ?: 0)
     result = 31 * result + (quotedTextForReply?.hashCode() ?: 0)
+    result = 31 * result + (draftId?.hashCode() ?: 0)
+    result = 31 * result + (draftThreadId?.hashCode() ?: 0)
     return result
   }
 
@@ -120,15 +127,16 @@ data class OutgoingMessageInfo(
   ): MessageEntity {
     val timestamp = System.currentTimeMillis()
     return MessageEntity(
-      email = requireNotNull(account),
+      account = requireNotNull(account),
+      accountType = requireNotNull(accountType),
       folder = folder,
       uid = uid,
       receivedDate = timestamp,
       sentDate = timestamp,
-      fromAddress = from.toString(),
-      replyTo = replyTo,
-      toAddress = InternetAddress.toString(toRecipients?.toTypedArray()),
-      ccAddress = InternetAddress.toString(ccRecipients?.toTypedArray()),
+      fromAddresses = from.toString(),
+      replyToAddresses = replyTo,
+      toAddresses = InternetAddress.toString(toRecipients?.toTypedArray()),
+      ccAddresses = InternetAddress.toString(ccRecipients?.toTypedArray()),
       subject = subject,
       flags = flags.toString().uppercase(),
       hasAttachments = atts?.isNotEmpty() == true || forwardedAtts?.isNotEmpty() == true,
@@ -140,7 +148,9 @@ data class OutgoingMessageInfo(
         MessageState.NEW.value
       },
       password = password,
-      attachmentsDirectory = UUID.randomUUID().toString()
+      attachmentsDirectory = UUID.randomUUID().toString(),
+      draftId = draftId,
+      threadId = draftThreadId
     )
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/FlowCryptRoomDatabase.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/FlowCryptRoomDatabase.kt
index 76087e5572..591129090d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/FlowCryptRoomDatabase.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/FlowCryptRoomDatabase.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database
@@ -11,11 +11,13 @@ import android.database.sqlite.SQLiteDatabase
 import android.provider.BaseColumns
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
+import androidx.core.database.getStringOrNull
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.sqlite.db.SupportSQLiteDatabase
+import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.database.converters.ClientConfigurationConverter
 import com.flowcrypt.email.database.converters.LabelListVisibilityConverter
@@ -40,6 +42,7 @@ import com.flowcrypt.email.database.entity.LabelEntity
 import com.flowcrypt.email.database.entity.MessageEntity
 import com.flowcrypt.email.database.entity.PublicKeyEntity
 import com.flowcrypt.email.database.entity.RecipientEntity
+import com.flowcrypt.email.extensions.android.content.fillWithDataFromCursor
 import com.flowcrypt.email.extensions.kotlin.toInputStream
 import com.flowcrypt.email.security.KeyStoreCryptoManager
 import com.flowcrypt.email.security.pgp.PgpKey
@@ -105,7 +108,7 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
 
   companion object {
     const val DB_NAME = "flowcrypt.db"
-    const val DB_VERSION = 45
+    const val DB_VERSION = 46
 
     private val MIGRATION_1_3 = object : FlowCryptMigration(1, 3) {
       override fun doMigration(database: SupportSQLiteDatabase) {
@@ -1239,8 +1242,8 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
       override fun doMigration(database: SupportSQLiteDatabase) {
         //we need to clean old cache for some 'com.google' users: messages, attachments, labels
 
-        val commonWhereClause = "email IN (SELECT email FROM " + AccountEntity.TABLE_NAME +
-            " WHERE account_type = ? AND use_api = ?)"
+        val commonWhereClause =
+          "email IN (SELECT email FROM accounts WHERE account_type = ? AND use_api = ?)"
         val commonWhereArgs = arrayOf(
           AccountEntity.ACCOUNT_TYPE_GOOGLE,
           "0",
@@ -1248,14 +1251,14 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
         )
         //delete messages for predefined 'com.google' users, except outgoing
         database.delete(
-          MessageEntity.TABLE_NAME,
+          "messages",
           "$commonWhereClause AND folder != ?",
           commonWhereArgs
         )
 
         //delete attachments for predefined 'com.google' users, except outgoing
         database.delete(
-          AttachmentEntity.TABLE_NAME,
+          "attachment",
           "$commonWhereClause AND folder != ?",
           commonWhereArgs
         )
@@ -1271,7 +1274,7 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
         val contentValues = ContentValues()
         contentValues.put("use_api", "1")
         database.update(
-          AccountEntity.TABLE_NAME,
+          "accounts",
           SQLiteDatabase.CONFLICT_IGNORE,
           contentValues,
           "account_type = ?",
@@ -1462,6 +1465,266 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
       }
     }
 
+    @VisibleForTesting
+    val MIGRATION_45_46 = object : FlowCryptMigration(45, 46) {
+      override fun doMigration(database: SupportSQLiteDatabase) {
+        //ref https://github.com/FlowCrypt/flowcrypt-android/issues/74
+        val mapAccountWithAccountType = mutableMapOf<String, String>()
+        //############## update accounts ##############
+        //add `use_conversation_mode` column
+        database.execSQL("ALTER TABLE accounts ADD COLUMN `use_conversation_mode` INTEGER NOT NULL DEFAULT 0;")
+        //update accounts table
+        database.query("SELECT * FROM accounts;").use { cursor ->
+          if (cursor.count > 0) {
+            while (cursor.moveToNext()) {
+              val id = cursor.getString(cursor.getColumnIndexOrThrow(BaseColumns._ID))
+              val email = cursor.getString(cursor.getColumnIndexOrThrow("email"))
+              val existingAccountType =
+                cursor.getStringOrNull(cursor.getColumnIndexOrThrow("account_type"))
+              val predictedAccountType =
+                EmailUtil.getDomain(email).ifEmpty { AccountEntity.ACCOUNT_TYPE_UNKNOWN }
+              val contentValues = ContentValues().apply {
+                if (existingAccountType.isNullOrEmpty()) {
+                  put("account_type", predictedAccountType)
+                } else if (existingAccountType == AccountEntity.ACCOUNT_TYPE_GOOGLE) {
+                  put("use_conversation_mode", 1)
+                }
+              }
+
+              if (contentValues.size() != 0) {
+                database.update(
+                  table = "accounts",
+                  conflictAlgorithm = SQLiteDatabase.CONFLICT_IGNORE,
+                  values = contentValues,
+                  whereClause = "${BaseColumns._ID} = ?",
+                  whereArgs = arrayOf(id)
+                )
+              }
+              mapAccountWithAccountType[email] = existingAccountType ?: predictedAccountType
+            }
+          }
+        }
+
+        //create temp table with existing content
+        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS accounts_temp AS SELECT * FROM accounts;")
+        //drop old table
+        database.execSQL("DROP TABLE IF EXISTS accounts;")
+        //create a new table with new structure
+        database.execSQL(
+          "CREATE TABLE IF NOT EXISTS `accounts` " +
+              "(`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+              "`email` TEXT NOT NULL, " +
+              "`account_type` TEXT NOT NULL, " +
+              "`display_name` TEXT DEFAULT NULL, " +
+              "`given_name` TEXT DEFAULT NULL, " +
+              "`family_name` TEXT DEFAULT NULL, " +
+              "`photo_url` TEXT DEFAULT NULL, " +
+              "`is_enabled` INTEGER DEFAULT 1, " +
+              "`is_active` INTEGER DEFAULT 0, " +
+              "`username` TEXT NOT NULL, " +
+              "`password` TEXT NOT NULL, " +
+              "`imap_server` TEXT NOT NULL, " +
+              "`imap_port` INTEGER DEFAULT 143, " +
+              "`imap_use_ssl_tls` INTEGER DEFAULT 0, " +
+              "`imap_use_starttls` INTEGER DEFAULT 0, " +
+              "`imap_auth_mechanisms` TEXT, " +
+              "`smtp_server` TEXT NOT NULL, " +
+              "`smtp_port` INTEGER DEFAULT 25, " +
+              "`smtp_use_ssl_tls` INTEGER DEFAULT 0, " +
+              "`smtp_use_starttls` INTEGER DEFAULT 0, " +
+              "`smtp_auth_mechanisms` TEXT, " +
+              "`smtp_use_custom_sign` INTEGER DEFAULT 0, " +
+              "`smtp_username` TEXT DEFAULT NULL, " +
+              "`smtp_password` TEXT DEFAULT NULL, " +
+              "`contacts_loaded` INTEGER DEFAULT 0, " +
+              "`show_only_encrypted` INTEGER DEFAULT 0, " +
+              "`client_configuration` TEXT DEFAULT NULL, " +
+              "`use_api` INTEGER NOT NULL DEFAULT 0, " +
+              "`use_customer_fes_url` INTEGER NOT NULL DEFAULT 0, " +
+              "`service_pgp_passphrase` TEXT NOT NULL, " +
+              "`service_pgp_private_key` BLOB NOT NULL, " +
+              "`signature` TEXT DEFAULT NULL, " +
+              "`use_alias_signatures` INTEGER NOT NULL DEFAULT 0, " +
+              "`use_conversation_mode` INTEGER NOT NULL DEFAULT 0)"
+        )
+        //create indices for new table
+        database.execSQL(
+          "CREATE UNIQUE INDEX IF NOT EXISTS `email_account_type_in_accounts` " +
+              "ON `accounts` (`email`, `account_type`)"
+        )
+        //fill new table with existing data.
+        database.execSQL("INSERT INTO `accounts` SELECT * FROM accounts_temp;")
+        //drop temp table
+        database.execSQL("DROP TABLE IF EXISTS accounts_temp;")
+        //##########################
+
+        //############## delete old data for 'messages' and 'attachment', except outgoing data #############
+        val commonWhereClause = "email IN (SELECT email FROM accounts) AND folder != ?"
+        val commonWhereArgs = arrayOf(JavaEmailConstants.FOLDER_OUTBOX)
+        database.delete(
+          "messages",
+          commonWhereClause,
+          commonWhereArgs
+        )
+        database.delete(
+          "attachment",
+          commonWhereClause,
+          commonWhereArgs
+        )
+        //##########################
+
+        //############## update messages and attachments ##############
+        //create temp table with existing content
+        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS messages_temp AS SELECT * FROM messages;")
+        database.execSQL("CREATE TEMP TABLE IF NOT EXISTS attachments_temp AS SELECT * FROM attachment;")
+        //drop old table
+        database.execSQL("DROP TABLE IF EXISTS messages;")
+        database.execSQL("DROP TABLE IF EXISTS attachment;")
+        //create a new table with new structure
+        database.execSQL(
+          "CREATE TABLE IF NOT EXISTS `messages` (" +
+              "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+              "`account` TEXT NOT NULL, " +
+              "`account_type` TEXT NOT NULL, " +
+              "`folder` TEXT NOT NULL, " +
+              "`uid` INTEGER NOT NULL, " +
+              "`received_date` INTEGER DEFAULT NULL, " +
+              "`sent_date` INTEGER DEFAULT NULL, " +
+              "`from_addresses` TEXT DEFAULT NULL, " +
+              "`to_addresses` TEXT DEFAULT NULL, " +
+              "`cc_addresses` TEXT DEFAULT NULL, " +
+              "`reply_to_addresses` TEXT DEFAULT NULL, " +
+              "`subject` TEXT DEFAULT NULL, " +
+              "`flags` TEXT DEFAULT NULL, " +
+              "`has_attachments` INTEGER DEFAULT 0, " +
+              "`is_new` INTEGER DEFAULT -1, " +
+              "`state` INTEGER DEFAULT -1, " +
+              "`attachments_directory` TEXT, " +
+              "`error_message` TEXT DEFAULT NULL, " +
+              "`password` BLOB DEFAULT NULL, " +
+              "`is_visible` INTEGER NOT NULL DEFAULT 1, " +
+              "`thread_id` INTEGER DEFAULT NULL, " +
+              "`history_id` TEXT DEFAULT NULL, " +
+              "`draft_id` TEXT DEFAULT NULL, " +
+              "`label_ids` TEXT DEFAULT NULL, " +
+              "`is_encrypted` INTEGER DEFAULT -1, " +
+              "`has_pgp` INTEGER DEFAULT 0, " +
+              "`thread_messages_count` INTEGER DEFAULT NULL, " +
+              "`thread_drafts_count` INTEGER DEFAULT NULL, " +
+              "`snippet` TEXT DEFAULT NULL, " +
+              "FOREIGN KEY(`account`, `account_type`) " +
+              "REFERENCES `accounts`(`email`, `account_type`) " +
+              "ON UPDATE NO ACTION ON DELETE CASCADE )"
+        )
+
+        database.execSQL(
+          "CREATE TABLE IF NOT EXISTS `attachments` (" +
+              "`_id` INTEGER PRIMARY KEY AUTOINCREMENT, " +
+              "`account` TEXT NOT NULL, " +
+              "`account_type` TEXT NOT NULL, " +
+              "`folder` TEXT NOT NULL, " +
+              "`uid` INTEGER NOT NULL, " +
+              "`name` TEXT NOT NULL, " +
+              "`encodedSize` INTEGER DEFAULT 0, " +
+              "`type` TEXT NOT NULL, " +
+              "`attachment_id` TEXT, " +
+              "`file_uri` TEXT, " +
+              "`forwarded_folder` TEXT, " +
+              "`forwarded_uid` INTEGER DEFAULT -1, " +
+              "`decrypt_when_forward` INTEGER NOT NULL DEFAULT 0, " +
+              "`path` TEXT NOT NULL, " +
+              "FOREIGN KEY(`account`, `account_type`, `folder`, `uid`) " +
+              "REFERENCES `messages`(`account`, `account_type`, `folder`, `uid`) " +
+              "ON UPDATE NO ACTION ON DELETE CASCADE )"
+        )
+        //create indices for new table
+        database.execSQL(
+          "CREATE INDEX IF NOT EXISTS `account_account_type_in_messages` " +
+              "ON `messages` (`account`, `account_type`)"
+        )
+        database.execSQL(
+          "CREATE INDEX IF NOT EXISTS `uid_in_messages` " +
+              "ON `messages` (`uid`)"
+        )
+        database.execSQL(
+          "CREATE UNIQUE INDEX IF NOT EXISTS `account_account_type_folder_uid_in_messages` " +
+              "ON `messages` (`account`, `account_type`, `folder`, `uid`)"
+        )
+
+        database.execSQL(
+          "CREATE INDEX IF NOT EXISTS `account_account_type_folder_uid_in_attachments` " +
+              "ON `attachments` (`account`, `account_type`, `folder`, `uid`)"
+        )
+        database.execSQL(
+          "CREATE UNIQUE INDEX IF NOT EXISTS " +
+              "`account_account_type_folder_uid_path_in_attachments` " +
+              "ON `attachments` (`account`, `account_type`, `folder`, `uid`, `path`)"
+        )
+        //fill new table with existing data.
+        database.query("SELECT * FROM messages_temp;").use { cursor ->
+          if (cursor.count > 0) {
+            while (cursor.moveToNext()) {
+              val contentValues = ContentValues().apply {
+                val email = cursor.getString(cursor.getColumnIndexOrThrow("email"))
+                put(
+                  "account_type",
+                  mapAccountWithAccountType[email] ?: AccountEntity.ACCOUNT_TYPE_UNKNOWN
+                )
+                fillWithDataFromCursor(
+                  cursor = cursor,
+                  namesToBeRenamed = mapOf(
+                    "email" to "account",
+                    "from_address" to "from_addresses",
+                    "to_address" to "to_addresses",
+                    "cc_address" to "cc_addresses",
+                    "is_message_has_attachments" to "has_attachments",
+                    "error_msg" to "error_message",
+                    "reply_to" to "reply_to_addresses",
+                  )
+                )
+              }
+
+              database.insert(
+                table = "messages",
+                conflictAlgorithm = SQLiteDatabase.CONFLICT_NONE,
+                values = contentValues
+              )
+            }
+          }
+        }
+
+        database.query("SELECT * FROM attachments_temp;").use { cursor ->
+          if (cursor.count > 0) {
+            while (cursor.moveToNext()) {
+              val contentValues = ContentValues().apply {
+                val email = cursor.getString(cursor.getColumnIndexOrThrow("email"))
+                put(
+                  "account_type",
+                  mapAccountWithAccountType[email] ?: AccountEntity.ACCOUNT_TYPE_UNKNOWN
+                )
+                fillWithDataFromCursor(
+                  cursor = cursor,
+                  skippedNames = setOf(BaseColumns._ID),
+                  namesToBeRenamed = mapOf("email" to "account")
+                )
+              }
+
+              database.insert(
+                table = "attachments",
+                conflictAlgorithm = SQLiteDatabase.CONFLICT_IGNORE,
+                values = contentValues
+              )
+            }
+          }
+        }
+
+        //drop temp table
+        database.execSQL("DROP TABLE IF EXISTS messages_temp;")
+        database.execSQL("DROP TABLE IF EXISTS attachments_temp;")
+        //##########################
+      }
+    }
+
     // Singleton prevents multiple instances of database opening at the same time.
     @Volatile
     private var INSTANCE: FlowCryptRoomDatabase? = null
@@ -1521,6 +1784,7 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
           Migration42to43(context.applicationContext),
           MIGRATION_43_44,
           MIGRATION_44_45,
+          MIGRATION_45_46,
         ).build()
         INSTANCE = instance
         return instance
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AttachmentDao.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AttachmentDao.kt
index 7178f701ce..50b838796d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AttachmentDao.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AttachmentDao.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database.dao
@@ -16,28 +16,31 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface AttachmentDao : BaseDao<AttachmentEntity> {
 
-  @Query("DELETE FROM attachment WHERE email = :email AND folder = :label")
-  suspend fun deleteAtt(email: String?, label: String?): Int
-
-  @Query("SELECT * FROM attachment WHERE email = :account AND folder = :label AND uid = :uid")
-  fun getAttachments(account: String, label: String, uid: Long): List<AttachmentEntity>
-
-  @Query("SELECT * FROM attachment WHERE email = :account AND folder = :label AND uid = :uid")
-  suspend fun getAttachmentsSuspend(
+  @Query(
+    "SELECT * FROM attachments WHERE account = :account " +
+        "AND account_type = :accountType AND folder = :label AND uid = :uid"
+  )
+  suspend fun getAttachments(
     account: String,
+    accountType: String,
     label: String,
     uid: Long
   ): List<AttachmentEntity>
 
-  @Query("SELECT * FROM attachment WHERE email = :account AND folder = :label AND uid = :uid")
-  fun getAttachmentsFlow(account: String, label: String, uid: Long): Flow<List<AttachmentEntity>>
-
-  @Query("DELETE FROM attachment WHERE email = :account AND folder = :label AND uid = :uid")
-  fun deleteAtt(account: String, label: String, uid: Long): Int
-
-  @Query("DELETE FROM attachment WHERE email = :account AND folder = :label AND uid = :uid")
-  suspend fun deleteAttSuspend(account: String, label: String, uid: Long): Int
+  @Query(
+    "SELECT * FROM attachments WHERE account = :account " +
+        "AND account_type = :accountType AND folder = :label AND uid = :uid"
+  )
+  fun getAttachmentsFlow(
+    account: String,
+    accountType: String,
+    label: String,
+    uid: Long
+  ): Flow<List<AttachmentEntity>>
 
-  @Query("DELETE FROM attachment WHERE email = :email")
-  suspend fun deleteByEmailSuspend(email: String?): Int
+  @Query(
+    "DELETE FROM attachments WHERE account = :account " +
+        "AND account_type = :accountType AND folder = :label AND uid = :uid"
+  )
+  suspend fun deleteAttachments(account: String, accountType: String, label: String, uid: Long): Int
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/BaseDao.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/BaseDao.kt
index 29bcf13502..035942e964 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/BaseDao.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/BaseDao.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database.dao
@@ -76,7 +76,6 @@ interface BaseDao<T> {
   @Query("SELECT sqlite_sequence.seq FROM sqlite_sequence WHERE name = :table")
   suspend fun getLastAutoIncrementId(table: String?): Long?
 
-
   companion object {
     fun <M> doOperationViaSteps(
       stepValue: Int = 50, list: List<M>,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/MessageDao.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/MessageDao.kt
index 862ae46372..c3861426ec 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/MessageDao.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/MessageDao.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database.dao
@@ -21,6 +21,7 @@ import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
 import jakarta.mail.Flags
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
 
 /**
@@ -30,25 +31,28 @@ import kotlinx.coroutines.withContext
  */
 @Dao
 abstract class MessageDao : BaseDao<MessageEntity> {
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :folder AND uid = :uid")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder AND uid = :uid")
   abstract fun getMsg(account: String?, folder: String?, uid: Long): MessageEntity?
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :folder AND uid = :uid")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder AND uid = :uid")
   abstract suspend fun getMsgSuspend(account: String?, folder: String?, uid: Long): MessageEntity?
 
   @Query("SELECT * FROM messages WHERE _id = :id")
   abstract suspend fun getMsgById(id: Long): MessageEntity?
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :folder")
+  @Query("SELECT * FROM messages WHERE _id = :id")
+  abstract fun getMessageByIdFlow(id: Long): Flow<MessageEntity?>
+
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder")
   abstract fun getMsgsLD(account: String, folder: String): LiveData<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :folder")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder")
   abstract fun getMsgs(account: String, folder: String): List<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :folder")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder")
   abstract suspend fun getMsgsSuspend(account: String, folder: String): List<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :folder AND _id IN (:msgsID)")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder AND _id IN (:msgsID)")
   abstract suspend fun getMsgsByIDSuspend(
     account: String,
     folder: String,
@@ -60,7 +64,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder AND is_new = 1 ORDER BY :orderBy"
+        "WHERE account = :account AND folder = :folder AND is_new = 1 ORDER BY :orderBy"
   )
   abstract fun getNewMsgs(
     account: String, folder: String,
@@ -69,7 +73,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder AND is_new = 1 ORDER BY :orderBy"
+        "WHERE account = :account AND folder = :folder AND is_new = 1 ORDER BY :orderBy"
   )
   abstract suspend fun getNewMsgsSuspend(
     account: String, folder: String,
@@ -78,7 +82,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder AND uid IN (:msgsUID)"
+        "WHERE account = :account AND folder = :folder AND uid IN (:msgsUID)"
   )
   abstract fun getMsgsByUids(
     account: String?,
@@ -88,7 +92,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder AND uid IN (:msgsUID)"
+        "WHERE account = :account AND folder = :folder AND uid IN (:msgsUID)"
   )
   abstract suspend fun getMsgsByUidsSuspend(
     account: String?,
@@ -98,7 +102,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder ORDER BY received_date DESC"
+        "WHERE account = :account AND folder = :folder AND is_visible = 1 ORDER BY received_date DESC"
   )
   abstract fun getMessagesDataSourceFactory(
     account: String,
@@ -108,13 +112,13 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   @Query(
     "SELECT * FROM (" +
         "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder AND received_date > :date " +
+        "WHERE account = :account AND folder = :folder AND is_visible = 1 AND received_date > :date " +
         "ORDER BY received_date ASC " +
         "LIMIT :limit) " +
         "UNION " +
         "SELECT * FROM (" +
         "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder AND received_date <= :date " +
+        "WHERE account = :account AND folder = :folder AND is_visible = 1 AND received_date <= :date " +
         "ORDER BY received_date DESC " +
         "LIMIT :limit) " +
         "ORDER BY received_date DESC"
@@ -126,44 +130,44 @@ abstract class MessageDao : BaseDao<MessageEntity> {
     limit: Int
   ): List<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :folder AND uid = :uid")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder AND uid = :uid")
   abstract fun getMsgLiveData(account: String, folder: String, uid: Long): LiveData<MessageEntity?>
 
   @Query("SELECT * FROM messages WHERE _id = :id")
   abstract fun getMsgLiveDataById(id: Long): LiveData<MessageEntity?>
 
-  @Query("DELETE FROM messages WHERE email = :email AND folder = :label")
-  abstract suspend fun delete(email: String?, label: String?): Int
+  @Query("DELETE FROM messages WHERE account = :account AND folder = :label")
+  abstract suspend fun delete(account: String?, label: String?): Int
 
-  @Query("DELETE FROM messages WHERE email = :email AND folder NOT IN (:labels)")
+  @Query("DELETE FROM messages WHERE account = :account AND folder NOT IN (:labels)")
   abstract suspend fun deleteAllExceptRelatedToLabels(
-    email: String?,
+    account: String?,
     labels: Collection<String>
   ): Int
 
-  @Query("DELETE FROM messages WHERE email = :email AND folder = :label AND uid IN (:msgsUID)")
-  abstract fun delete(email: String?, label: String?, msgsUID: Collection<Long>): Int
+  @Query("DELETE FROM messages WHERE account = :account AND folder = :label AND uid IN (:msgsUID)")
+  abstract fun delete(account: String?, label: String?, msgsUID: Collection<Long>): Int
 
-  @Query("DELETE FROM messages WHERE email = :email AND folder = :label AND uid IN (:msgsUID)")
+  @Query("DELETE FROM messages WHERE account = :account AND folder = :label AND uid IN (:msgsUID)")
   abstract suspend fun deleteSuspendByUIDs(
-    email: String?,
+    account: String?,
     label: String?,
     msgsUID: Collection<Long>
   ): Int
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :label")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :label")
   abstract fun getOutboxMsgs(
     account: String?,
     label: String = JavaEmailConstants.FOLDER_OUTBOX
   ): List<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :label")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :label")
   abstract fun getOutboxMsgsLD(
     account: String?,
     label: String = JavaEmailConstants.FOLDER_OUTBOX
   ): LiveData<List<MessageEntity>>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :label")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :label")
   abstract suspend fun getOutboxMsgsSuspend(
     account: String?,
     label: String = JavaEmailConstants.FOLDER_OUTBOX
@@ -174,9 +178,14 @@ abstract class MessageDao : BaseDao<MessageEntity> {
     label: String = JavaEmailConstants.FOLDER_OUTBOX
   ): List<MessageEntity>
 
+  @Query("SELECT * FROM messages WHERE folder = :label")
+  abstract fun getAllOutboxMessagesFlow(
+    label: String = JavaEmailConstants.FOLDER_OUTBOX
+  ): Flow<List<MessageEntity>>
+
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :label AND state IN (:msgStates)"
+        "WHERE account = :account AND folder = :label AND state IN (:msgStates)"
   )
   abstract fun getOutboxMsgsByStates(
     account: String?, label: String = JavaEmailConstants.FOLDER_OUTBOX,
@@ -185,7 +194,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :label AND state IN (:msgStates)"
+        "WHERE account = :account AND folder = :label AND state IN (:msgStates)"
   )
   abstract suspend fun getOutboxMsgsByStatesSuspend(
     account: String?,
@@ -194,11 +203,11 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   ): List<MessageEntity>
 
   @Query(
-    "DELETE FROM messages WHERE email = :email " +
+    "DELETE FROM messages WHERE account = :account " +
         "AND folder = :label AND uid = :uid AND (state NOT IN (:msgStates) OR state IS NULL)"
   )
   abstract suspend fun deleteOutgoingMsg(
-    email: String?, label: String?, uid: Long?,
+    account: String?, label: String?, uid: Long?,
     msgStates: Collection<Int> = listOf(
       MessageState.SENDING.value,
       MessageState.SENT_WITHOUT_LOCAL_COPY.value,
@@ -207,7 +216,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   ): Int
 
   @Query(
-    "SELECT COUNT(*) FROM messages WHERE email = :account " +
+    "SELECT COUNT(*) FROM messages WHERE account = :account " +
         "AND folder = :label AND (state IN (:msgStates) OR state IS NULL)"
   )
   abstract suspend fun getFailedOutgoingMessagesCountSuspend(
@@ -225,63 +234,63 @@ abstract class MessageDao : BaseDao<MessageEntity> {
     )
   ): Int
 
-  @Query("SELECT COUNT(*) FROM messages WHERE email = :account AND folder = :folder")
-  abstract fun count(account: String?, folder: String?): Int
-
-  @Query("SELECT COUNT(*) FROM messages WHERE email = :account AND folder = :folder")
+  @Query("SELECT COUNT(*) FROM messages WHERE account = :account AND folder = :folder AND is_visible = 1")
   abstract suspend fun countSuspend(account: String?, folder: String?): Int?
 
-  @Query("SELECT max(uid) FROM messages WHERE email = :account AND folder = :folder")
-  abstract fun getLastUIDOfMsgForLabel(account: String?, folder: String?): Int
-
   @Query(
     "SELECT * FROM messages " +
-        "WHERE email = :account AND folder = :folder ORDER BY uid DESC LIMIT 1"
+        "WHERE account = :account AND folder = :folder AND is_visible = 1 ORDER BY uid DESC LIMIT 1"
   )
   abstract suspend fun getNewestMsg(account: String?, folder: String?): MessageEntity?
 
-  @Query("SELECT max(uid) FROM messages WHERE email = :account AND folder = :folder")
+  @Query(
+    "SELECT * FROM messages " +
+        "WHERE account = :account AND is_visible = 1 ORDER BY thread_id DESC LIMIT 1"
+  )
+  abstract suspend fun getNewestThread(account: String?): MessageEntity?
+
+  @Query("SELECT max(uid) FROM messages WHERE account = :account AND folder = :folder")
   abstract suspend fun getLastUIDOfMsgForLabelSuspend(account: String?, folder: String?): Int?
 
-  @Query("SELECT min(uid) FROM messages WHERE email = :account AND folder = :folder")
+  @Query("SELECT min(uid) FROM messages WHERE account = :account AND folder = :folder")
   abstract fun getOldestUIDOfMsgForLabel(account: String?, folder: String?): Int
 
-  @Query("SELECT min(uid) FROM messages WHERE email = :account AND folder = :folder")
+  @Query("SELECT min(uid) FROM messages WHERE account = :account AND folder = :folder")
   abstract suspend fun getOldestUIDOfMsgForLabelSuspend(account: String?, folder: String?): Int?
 
-  @Query("SELECT uid FROM messages WHERE email = :account AND folder = :folder")
+  @Query("SELECT uid FROM messages WHERE account = :account AND folder = :folder")
   abstract suspend fun getUIDsForLabel(account: String?, folder: String?): List<Long>
 
   /**
    * Get the list of UID of all messages in the database which were not checked to encryption.
    *
-   * @param account   The user email.
+   * @param account   The user account.
    * @param label     The label name.
    * @return The list of UID of selected messages in the database for some label.
    */
   @Query(
     "SELECT uid FROM messages " +
-        "WHERE email = :account AND folder = :label AND is_encrypted = -1"
+        "WHERE account = :account AND folder = :label AND is_encrypted = -1"
   )
   abstract suspend fun getNotCheckedUIDs(account: String?, label: String): List<Long>
 
   /**
    * Get a list of UID and flags of all unseen messages in the database for some label.
    *
-   * @param account   The user email.
+   * @param account   The user account.
    * @param label     The label name.
    * @return The list of UID and flags of all unseen messages in the database for some label.
    */
   @Query(
     "SELECT uid FROM messages " +
-        "WHERE email = :account AND folder = :label AND flags NOT LIKE '%\\SEEN'"
+        "WHERE account = :account AND folder = :label AND flags NOT LIKE '%\\SEEN'"
   )
   abstract fun getUIDOfUnseenMsgs(account: String?, label: String): List<Long>
 
   /**
    * Switch [MessageState] for messages of the given folder of the given account
    *
-   * @param account      The email that the message linked.
+   * @param account    The account that the message linked.
    * @param label      The folder label.
    * @param oldValue   The old value.
    * @param newValues  The new value.
@@ -289,19 +298,19 @@ abstract class MessageDao : BaseDao<MessageEntity> {
    */
   @Query(
     "UPDATE messages SET state=:newValues " +
-        "WHERE email = :account AND folder = :label AND state = :oldValue"
+        "WHERE account = :account AND folder = :label AND state = :oldValue"
   )
   abstract fun changeMsgsState(account: String?, label: String?, oldValue: Int, newValues: Int): Int
 
   @Query(
     "UPDATE messages SET state=:newValue " +
-        "WHERE email = :account AND folder = :label"
+        "WHERE account = :account AND folder = :label"
   )
   abstract fun changeMsgsState(account: String?, label: String?, newValue: Int? = null): Int
 
   @Query(
     "UPDATE messages SET state=:newValue " +
-        "WHERE email = :account AND folder = :label"
+        "WHERE account = :account AND folder = :label"
   )
   abstract suspend fun changeMsgsStateSuspend(
     account: String?,
@@ -311,7 +320,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "UPDATE messages SET state=:newValues " +
-        "WHERE email = :account AND folder = :label AND state = :oldValue"
+        "WHERE account = :account AND folder = :label AND state = :oldValue"
   )
   abstract suspend fun changeMsgsStateSuspend(
     account: String?, label: String?, oldValue: Int,
@@ -321,11 +330,11 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   /**
    * Add the messages which have a current state equal [MessageState.SENDING] to the sending queue again.
    *
-   * @param account   The email that the message linked
+   * @param account   The account that the message linked
    */
   @Query(
     "UPDATE messages SET state=2 " +
-        "WHERE email = :account AND folder = :label AND state =:oldValue"
+        "WHERE account = :account AND folder = :label AND state =:oldValue"
   )
   abstract fun resetMsgsWithSendingState(
     account: String?,
@@ -336,11 +345,11 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   /**
    * Add the messages which have a current state equal [MessageState.SENDING] to the sending queue again.
    *
-   * @param account   The email that the message linked
+   * @param account   The account that the message linked
    */
   @Query(
     "UPDATE messages SET state=2 " +
-        "WHERE email = :account AND folder = :label AND state =:oldValue"
+        "WHERE account = :account AND folder = :label AND state =:oldValue"
   )
   abstract suspend fun resetMsgsWithSendingStateSuspend(
     account: String?,
@@ -348,32 +357,32 @@ abstract class MessageDao : BaseDao<MessageEntity> {
     oldValue: Int = MessageState.SENDING.value
   ): Int
 
-  @Query("SELECT uid, flags FROM messages WHERE email = :account AND folder = :label")
+  @Query("SELECT uid, flags FROM messages WHERE account = :account AND folder = :label")
   abstract fun getUIDAndFlagsPairs(account: String?, label: String): List<UidFlagsPair>
 
-  @Query("SELECT uid, flags FROM messages WHERE email = :account AND folder = :label")
+  @Query("SELECT uid, flags FROM messages WHERE account = :account AND folder = :label")
   abstract suspend fun getUIDAndFlagsPairsSuspend(
     account: String?,
     label: String
   ): List<UidFlagsPair>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND state =:stateValue")
+  @Query("SELECT * FROM messages WHERE account = :account AND state =:stateValue")
   abstract fun getMsgsWithState(account: String?, stateValue: Int): List<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND state =:stateValue")
+  @Query("SELECT * FROM messages WHERE account = :account AND state =:stateValue")
   abstract suspend fun getMsgsWithStateSuspend(
     account: String?,
     stateValue: Int
   ): List<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :label AND state =:stateValue")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :label AND state =:stateValue")
   abstract fun getMsgsWithState(
     account: String?,
     label: String?,
     stateValue: Int
   ): List<MessageEntity>
 
-  @Query("SELECT * FROM messages WHERE email = :account AND folder = :label AND state =:stateValue")
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :label AND state =:stateValue")
   abstract suspend fun getMsgsWithStateSuspend(
     account: String?,
     label: String?,
@@ -382,7 +391,7 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Query(
     "UPDATE messages SET is_new = 0 " +
-        "WHERE email = :account AND folder = :label AND uid IN (:uidList)"
+        "WHERE account = :account AND folder = :label AND uid IN (:uidList)"
   )
   abstract suspend fun markMsgsAsOld(
     account: String?,
@@ -390,58 +399,96 @@ abstract class MessageDao : BaseDao<MessageEntity> {
     uidList: Collection<Long>
   ): Int
 
-  @Query("UPDATE messages SET is_new = 0 WHERE email = :account AND folder = :label AND is_new = 1")
+  @Query("UPDATE messages SET is_new = 0 WHERE account = :account AND folder = :label AND is_new = 1")
   abstract suspend fun markMsgsAsOld(account: String?, label: String?): Int
 
-  @Query("DELETE FROM messages WHERE email = :email")
-  abstract suspend fun deleteByEmailSuspend(email: String?): Int
+  @Query("DELETE FROM messages WHERE account = :account")
+  abstract suspend fun deleteByEmailSuspend(account: String?): Int
 
-  @Query("SELECT COUNT(*) FROM messages WHERE email = :account AND folder = :label")
+  @Query("SELECT COUNT(*) FROM messages WHERE account = :account AND folder = :label")
   abstract suspend fun getMsgsCount(account: String, label: String): Int
 
+  @Query("SELECT * FROM messages WHERE account = :account AND folder = :folder AND thread_id = :threadId AND is_visible = 1")
+  abstract suspend fun getThreadMessageEntity(
+    account: String?,
+    folder: String?,
+    threadId: Long
+  ): MessageEntity?
+
+  @Query(
+    "SELECT * FROM messages WHERE account = :account AND folder = :folder " +
+        "AND thread_id = :threadId AND is_visible = 0"
+  )
+  abstract suspend fun getMessagesForGmailThread(
+    account: String,
+    folder: String,
+    threadId: Long
+  ): List<MessageEntity>
+
+  @Query("DELETE FROM messages WHERE account = :account AND folder = :folder AND thread_id = :threadId AND is_visible = 0")
+  abstract suspend fun clearCacheForGmailThread(account: String?, folder: String, threadId: Long)
+
+  @Query("DELETE FROM messages WHERE account = :account AND folder = :folder AND thread_id IN (:threadIdList) AND is_visible = 0")
+  abstract suspend fun deleteCacheForGmailThreads(
+    account: String?,
+    folder: String,
+    threadIdList: List<Long>
+  )
+
+  suspend fun getNewestMsgOrThread(accountEntity: AccountEntity, folder: String?): MessageEntity? {
+    return if (accountEntity.isGoogleSignInAccount
+      && accountEntity.useAPI
+      && accountEntity.useConversationMode
+    ) {
+      getNewestThread(accountEntity.email)
+    } else {
+      getNewestMsg(accountEntity.email, folder)
+    }
+  }
+
   @Transaction
-  open fun deleteByUIDs(email: String?, label: String?, msgsUID: Collection<Long>) {
+  open fun deleteByUIDs(account: String?, label: String?, msgsUID: Collection<Long>) {
     doOperationViaSteps(list = ArrayList(msgsUID)) { stepUIDs: Collection<Long> ->
-      delete(email, label, stepUIDs)
+      delete(account, label, stepUIDs)
     }
   }
 
   @Transaction
-  open suspend fun deleteByUIDsSuspend(email: String?, label: String?, msgsUID: Collection<Long>) =
+  open suspend fun deleteByUIDsSuspend(account: String?, label: String?, msgsUID: Collection<Long>) =
     withContext(Dispatchers.IO) {
       doOperationViaStepsSuspend(list = ArrayList(msgsUID)) { stepUIDs: Collection<Long> ->
-        deleteSuspendByUIDs(email, label, stepUIDs)
+        deleteSuspendByUIDs(account, label, stepUIDs)
       }
     }
 
   @Transaction
-  open fun updateFlags(email: String?, label: String?, flagsMap: Map<Long, Flags>) {
+  open fun updateFlags(account: String?, label: String?, flagsMap: Map<Long, Flags>) {
     doOperationViaSteps(list = ArrayList(flagsMap.keys)) { stepUIDs: Collection<Long> ->
-      updateFlagsByUIDs(email, label, flagsMap, stepUIDs)
+      updateFlagsByUIDs(account, label, flagsMap, stepUIDs)
     }
   }
 
   @Transaction
-  open suspend fun updateFlagsSuspend(email: String?, label: String?, flagsMap: Map<Long, Flags>) =
+  open suspend fun updateFlagsSuspend(account: String?, label: String?, flagsMap: Map<Long, Flags>) =
     withContext(Dispatchers.IO) {
       doOperationViaStepsSuspend(list = ArrayList(flagsMap.keys)) { stepUIDs: Collection<Long> ->
-        updateFlagsByUIDsSuspend(email, label, flagsMap, stepUIDs)
+        updateFlagsByUIDsSuspend(account, label, flagsMap, stepUIDs)
       }
     }
 
   /**
    * Update the message flags in the local database.
    *
-   * @param email   The email that the message linked.
+   * @param account   The account that the message linked.
    * @param label   The folder label.
    * @param uid     The message UID.
    * @param flags   The message flags.
    */
   @Transaction
-  open suspend fun updateLocalMsgFlags(email: String?, label: String?, uid: Long, flags: Flags) =
+  open suspend fun updateLocalMsgFlags(account: String?, label: String?, uid: Long, flags: Flags) =
     withContext(Dispatchers.IO) {
       val msgEntity =
-        getMsgSuspend(account = email, folder = label, uid = uid) ?: return@withContext
+        getMsgSuspend(account = account, folder = label, uid = uid) ?: return@withContext
       val modifiedMsgEntity = if (flags.contains(Flags.Flag.SEEN)) {
         msgEntity.copy(flags = flags.toString().uppercase(), isNew = false)
       } else {
@@ -452,11 +499,11 @@ abstract class MessageDao : BaseDao<MessageEntity> {
 
   @Transaction
   open suspend fun updateEncryptionStates(
-    email: String?,
+    account: String?,
     label: String?,
     flagsMap: Map<Long, Boolean>
   ) = withContext(Dispatchers.IO) {
-    val msgEntities = getMsgsByUidsSuspend(account = email, folder = label, msgsUID = flagsMap.keys)
+    val msgEntities = getMsgsByUidsSuspend(account = account, folder = label, msgsUID = flagsMap.keys)
     val modifiedMsgEntities = ArrayList<MessageEntity>()
 
     for (msgEntity in msgEntities) {
@@ -472,65 +519,65 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   /**
    * Get a map of UID and flags of all messages in the database for some label.
    *
-   * @param email   The user email.
+   * @param account   The user account.
    * @param label   The label name.
    * @return The map of UID and flags of all messages in the database for some label.
    */
   @Transaction
-  open fun getMapOfUIDAndMsgFlags(email: String, label: String): Map<Long, String?> {
-    return getUIDAndFlagsPairs(email, label).associate { it.uid to it.flags }
+  open fun getMapOfUIDAndMsgFlags(account: String, label: String): Map<Long, String?> {
+    return getUIDAndFlagsPairs(account, label).associate { it.uid to it.flags }
   }
 
   /**
    * Get a map of UID and flags of all messages in the database for some label.
    *
-   * @param email   The user email.
+   * @param account   The user account.
    * @param label   The label name.
    * @return The map of UID and flags of all messages in the database for some label.
    */
   @Transaction
-  open suspend fun getMapOfUIDAndMsgFlagsSuspend(email: String, label: String): Map<Long, String?> =
+  open suspend fun getMapOfUIDAndMsgFlagsSuspend(account: String, label: String): Map<Long, String?> =
     withContext(Dispatchers.IO) {
-      return@withContext getUIDAndFlagsPairsSuspend(email, label).associate { it.uid to it.flags }
+      return@withContext getUIDAndFlagsPairsSuspend(account, label).associate { it.uid to it.flags }
     }
 
   /**
    * Mark messages as old in the local database.
    *
-   * @param email   The email that the message linked.
+   * @param account   The account that the message linked.
    * @param label   The folder label.
    * @param uidList The list of the UIDs.
    */
   @Transaction
-  open suspend fun setOldStatus(email: String?, label: String?, uidList: List<Long>) =
+  open suspend fun setOldStatus(account: String?, label: String?, uidList: List<Long>) =
     withContext(Dispatchers.IO) {
       doOperationViaStepsSuspend(list = uidList) { stepUIDs: Collection<Long> ->
-        markMsgsAsOld(email, label, stepUIDs)
+        markMsgsAsOld(account, label, stepUIDs)
       }
     }
 
   open suspend fun getMsgsByUIDs(
-    email: String,
+    account: String,
     label: String,
     uidList: List<Long>
   ): List<MessageEntity> = withContext(Dispatchers.IO) {
     return@withContext getEntitiesViaStepsSuspend(list = uidList) { stepUIDs: Collection<Long> ->
-      getMsgsByUids(email, label, stepUIDs)
+      getMsgsByUids(account, label, stepUIDs)
     }
   }
 
   open suspend fun updateGmailLabels(
-    email: String?,
+    account: String?,
     label: String?,
     labelsToBeUpdatedMap: Map<Long, String>
   ) =
     withContext(Dispatchers.IO) {
-      if (email == null || label == null) {
+      if (account == null || label == null) {
         return@withContext
       }
 
       val messagesToBeUpdated = getMsgsByUIDs(
-        email = email,
+        account = account,
         label = label,
         uidList = labelsToBeUpdatedMap.keys.toList()
       ).map { entity ->
@@ -555,10 +602,10 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   }
 
   private suspend fun updateFlagsByUIDsSuspend(
-    email: String?, label: String?, flagsMap: Map<Long, Flags>,
+    account: String?, label: String?, flagsMap: Map<Long, Flags>,
     uids: Collection<Long>?
   ): Int = withContext(Dispatchers.IO) {
-    val msgEntities = getMsgsByUidsSuspend(account = email, folder = label, msgsUID = uids)
+    val msgEntities = getMsgsByUidsSuspend(account = account, folder = label, msgsUID = uids)
     val modifiedMsgEntities = ArrayList<MessageEntity>()
 
     for (msgEntity in msgEntities) {
@@ -577,10 +624,10 @@ abstract class MessageDao : BaseDao<MessageEntity> {
   }
 
   private fun updateFlagsByUIDs(
-    email: String?, label: String?, flagsMap: Map<Long, Flags>,
+    account: String?, label: String?, flagsMap: Map<Long, Flags>,
     uids: Collection<Long>?
   ): Int {
-    val msgEntities = getMsgsByUids(account = email, folder = label, msgsUID = uids)
+    val msgEntities = getMsgsByUids(account = account, folder = label, msgsUID = uids)
     val modifiedMsgEntities = ArrayList<MessageEntity>()
 
     for (msgEntity in msgEntities) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt
index fea49dc4f9..26cf5f33a5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database.entity
@@ -14,6 +14,7 @@ import androidx.room.Ignore
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.api.email.gmail.GmailConstants
 import com.flowcrypt.email.api.email.model.AuthCredentials
@@ -30,7 +31,7 @@ import kotlinx.parcelize.Parcelize
  * @author Denys Bondarenko
  */
 @Entity(
-  tableName = AccountEntity.TABLE_NAME,
+  tableName = "accounts",
   indices = [
     Index(name = "email_account_type_in_accounts", value = ["email", "account_type"], unique = true)
   ]
@@ -40,7 +41,7 @@ data class AccountEntity(
   @PrimaryKey(autoGenerate = true)
   @ColumnInfo(name = BaseColumns._ID) val id: Long? = null,
   val email: String,
-  @ColumnInfo(name = "account_type", defaultValue = "NULL") val accountType: String? = null,
+  @ColumnInfo(name = "account_type") val accountType: String,
   @ColumnInfo(name = "display_name", defaultValue = "NULL") val displayName: String? = null,
   @ColumnInfo(name = "given_name", defaultValue = "NULL") val givenName: String? = null,
   @ColumnInfo(name = "family_name", defaultValue = "NULL") val familyName: String? = null,
@@ -83,13 +84,12 @@ data class AccountEntity(
   @ColumnInfo(name = "service_pgp_private_key") val servicePgpPrivateKey: ByteArray,
   @ColumnInfo(name = "signature", defaultValue = "NULL") val signature: String? = null,
   @ColumnInfo(name = "use_alias_signatures", defaultValue = "0") val useAliasSignatures: Boolean = false,
+  @ColumnInfo(name = "use_conversation_mode", defaultValue = "0") val useConversationMode: Boolean = false,
 ) : Parcelable {
 
   @IgnoredOnParcel
   @Ignore
-  val account: Account = Account(this.email.ifEmpty { "unknown" },
-    accountType ?: this.email.substring(this.email.indexOf('@') + 1).lowercase()
-      .ifEmpty { "unknown" })
+  val account: Account = Account(this.email.ifEmpty { ACCOUNT_TYPE_UNKNOWN }, accountType)
 
   @IgnoredOnParcel
   @Ignore
@@ -109,7 +109,9 @@ data class AccountEntity(
     useStartTlsForSmtp: Boolean = false,
   ) : this(
     email = requireNotNull(googleSignInAccount.email).lowercase(),
-    accountType = googleSignInAccount.account?.type?.lowercase(),
+    accountType = googleSignInAccount.account?.type?.lowercase() ?: EmailUtil.getDomain(
+      requireNotNull(googleSignInAccount.email)
+    ).ifEmpty { ACCOUNT_TYPE_UNKNOWN },
     displayName = googleSignInAccount.displayName,
     givenName = googleSignInAccount.givenName,
     familyName = googleSignInAccount.familyName,
@@ -142,14 +144,14 @@ data class AccountEntity(
     useCustomerFesUrl = useCustomerFesUrl,
     servicePgpPassphrase = "",
     servicePgpPrivateKey = byteArrayOf(),
-    useAliasSignatures = true
+    useAliasSignatures = true,
+    useConversationMode = true
   )
 
   constructor(authCredentials: AuthCredentials, clientConfiguration: ClientConfiguration? = null) :
       this(
         email = authCredentials.email.lowercase(),
-        accountType =
-        authCredentials.email.substring(authCredentials.email.indexOf('@') + 1).lowercase(),
+        accountType = EmailUtil.getDomain(authCredentials.email).ifEmpty { ACCOUNT_TYPE_UNKNOWN },
         displayName = authCredentials.displayName,
         givenName = null,
         familyName = null,
@@ -183,7 +185,7 @@ data class AccountEntity(
   constructor(email: String) :
       this(
         email = email,
-        accountType = null,
+        accountType = EmailUtil.getDomain(email).ifEmpty { ACCOUNT_TYPE_UNKNOWN },
         displayName = null,
         givenName = null,
         familyName = null,
@@ -305,6 +307,7 @@ data class AccountEntity(
     if (!servicePgpPrivateKey.contentEquals(other.servicePgpPrivateKey)) return false
     if (signature != other.signature) return false
     if (useAliasSignatures != other.useAliasSignatures) return false
+    if (useConversationMode != other.useConversationMode) return false
 
     return true
   }
@@ -312,7 +315,7 @@ data class AccountEntity(
   override fun hashCode(): Int {
     var result = id?.hashCode() ?: 0
     result = 31 * result + email.hashCode()
-    result = 31 * result + (accountType?.hashCode() ?: 0)
+    result = 31 * result + accountType.hashCode()
     result = 31 * result + (displayName?.hashCode() ?: 0)
     result = 31 * result + (givenName?.hashCode() ?: 0)
     result = 31 * result + (familyName?.hashCode() ?: 0)
@@ -343,12 +346,13 @@ data class AccountEntity(
     result = 31 * result + servicePgpPrivateKey.contentHashCode()
     result = 31 * result + (signature?.hashCode() ?: 0)
     result = 31 * result + useAliasSignatures.hashCode()
+    result = 31 * result + useConversationMode.hashCode()
     return result
   }
 
   companion object {
-    const val TABLE_NAME = "accounts"
     const val ACCOUNT_TYPE_GOOGLE = "com.google"
     const val ACCOUNT_TYPE_OUTLOOK = "outlook.com"
+    const val ACCOUNT_TYPE_UNKNOWN = "unknown"
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AttachmentEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AttachmentEntity.kt
index b6bc4c23d5..2e750576ad 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AttachmentEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AttachmentEntity.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database.entity
@@ -19,25 +19,29 @@ import com.flowcrypt.email.api.email.model.AttachmentInfo
  * @author Denys Bondarenko
  */
 @Entity(
-  tableName = AttachmentEntity.TABLE_NAME,
+  tableName = "attachments",
   indices = [
     Index(
-      name = "email_uid_folder_path_in_attachment",
-      value = ["email", "uid", "folder", "path"],
+      name = "account_account_type_folder_uid_in_attachments",
+      value = ["account", "account_type", "folder", "uid"]
+    ),
+    Index(
+      name = "account_account_type_folder_uid_path_in_attachments",
+      value = ["account", "account_type", "folder", "uid", "path"],
       unique = true
     ),
-    Index(name = "email_folder_uid_in_attachment", value = ["email", "folder", "uid"])
   ],
   foreignKeys = [
     ForeignKey(
-      entity = MessageEntity::class, parentColumns = ["email", "folder", "uid"],
-      childColumns = ["email", "folder", "uid"], onDelete = ForeignKey.CASCADE
+      entity = MessageEntity::class, parentColumns = ["account", "account_type", "folder", "uid"],
+      childColumns = ["account", "account_type", "folder", "uid"], onDelete = ForeignKey.CASCADE
     )
   ]
 )
 data class AttachmentEntity(
   @PrimaryKey(autoGenerate = true) @ColumnInfo(name = BaseColumns._ID) val id: Long?,
-  val email: String,
+  val account: String,
+  @ColumnInfo(name = "account_type") val accountType: String,
   val folder: String,
   val uid: Long,
   val name: String,
@@ -57,7 +61,7 @@ data class AttachmentEntity(
 
   fun toAttInfo(): AttachmentInfo {
     return AttachmentInfo.Builder(
-      email = email,
+      email = account,
       folder = folder,
       uid = uid,
       name = name,
@@ -75,9 +79,7 @@ data class AttachmentEntity(
   }
 
   companion object {
-    const val TABLE_NAME = "attachment"
-
-    fun fromAttInfo(attachmentInfo: AttachmentInfo): AttachmentEntity? {
+    fun fromAttInfo(attachmentInfo: AttachmentInfo, accountType: String): AttachmentEntity? {
       with(attachmentInfo) {
         val email = email ?: return null
         val folder = folder ?: return null
@@ -85,7 +87,8 @@ data class AttachmentEntity(
 
         return AttachmentEntity(
           id = null,
-          email = email,
+          account = email,
+          accountType = accountType,
           folder = folder,
           uid = uid,
           name = name,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
index d2d6116ce8..fd4443caff 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.database.entity
@@ -9,29 +9,48 @@ import android.content.ContentValues
 import android.content.Context
 import android.os.Parcelable
 import android.provider.BaseColumns
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.format.DateUtils
+import android.text.style.AbsoluteSizeSpan
+import android.text.style.ForegroundColorSpan
+import androidx.core.text.toSpannable
 import androidx.preference.PreferenceManager
 import androidx.room.ColumnInfo
 import androidx.room.Entity
+import androidx.room.ForeignKey
 import androidx.room.Ignore
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.flowcrypt.email.Constants
+import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.EmailUtil
+import com.flowcrypt.email.api.email.FoldersManager
 import com.flowcrypt.email.api.email.JavaEmailConstants
-import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.api.email.gmail.api.GmaiAPIMimeMessage
+import com.flowcrypt.email.api.email.gmail.model.GmailThreadInfo
 import com.flowcrypt.email.api.email.model.MessageFlag
 import com.flowcrypt.email.api.email.model.OutgoingMessageInfo
 import com.flowcrypt.email.database.MessageState
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.hasAttachments
 import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.hasPgp
 import com.flowcrypt.email.extensions.jakarta.mail.hasPgp
+import com.flowcrypt.email.extensions.jakarta.mail.internet.getFormattedString
+import com.flowcrypt.email.extensions.jakarta.mail.internet.personalOrEmail
 import com.flowcrypt.email.extensions.kotlin.asInternetAddresses
 import com.flowcrypt.email.extensions.kotlin.capitalize
 import com.flowcrypt.email.extensions.kotlin.toHex
+import com.flowcrypt.email.extensions.threadIdAsLong
 import com.flowcrypt.email.extensions.uid
+import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.ui.activity.fragment.preferences.NotificationsSettingsFragment
 import com.flowcrypt.email.ui.adapter.GmailApiLabelsListAdapter
+import com.flowcrypt.email.ui.adapter.MessageHeadersListAdapter
+import com.flowcrypt.email.ui.adapter.MsgsPagedListAdapter.MessageViewHolder.Companion.SENDER_NAME_PATTERN
 import com.flowcrypt.email.util.SharedPreferencesHelper
+import com.flowcrypt.email.util.UIUtil
 import com.google.android.gms.common.util.CollectionUtils
 import jakarta.mail.Flags
 import jakarta.mail.Message
@@ -48,60 +67,80 @@ import java.util.Properties
 /**
  * @author Denys Bondarenko
  */
-//todo-denbond7 need to add ForeignKey on account table
 @Entity(
-  tableName = MessageEntity.TABLE_NAME,
+  tableName = "messages",
   indices = [
-    Index(name = "email_in_messages", value = ["email"]),
-    Index(name = "email_uid_folder_in_messages", value = ["email", "uid", "folder"], unique = true)
+    Index(name = "account_account_type_in_messages", value = ["account", "account_type"]),
+    Index(name = "uid_in_messages", value = ["uid"]),
+    Index(
+      name = "account_account_type_folder_uid_in_messages",
+      value = ["account", "account_type", "folder", "uid"],
+      unique = true
+    ),
+  ],
+  foreignKeys = [
+    ForeignKey(
+      entity = AccountEntity::class,
+      parentColumns = ["email", "account_type"],
+      childColumns = ["account", "account_type"],
+      onDelete = ForeignKey.CASCADE
+    )
   ]
 )
 @Parcelize
 data class MessageEntity(
   @PrimaryKey(autoGenerate = true) @ColumnInfo(name = BaseColumns._ID) val id: Long? = null,
-  val email: String,
+  val account: String,
+  @ColumnInfo(name = "account_type") val accountType: String,
   val folder: String,
   val uid: Long,
   @ColumnInfo(name = "received_date", defaultValue = "NULL") val receivedDate: Long? = null,
   @ColumnInfo(name = "sent_date", defaultValue = "NULL") val sentDate: Long? = null,
-  @ColumnInfo(name = "from_address", defaultValue = "NULL") val fromAddress: String? = null,
-  @ColumnInfo(name = "to_address", defaultValue = "NULL") val toAddress: String? = null,
-  @ColumnInfo(name = "cc_address", defaultValue = "NULL") val ccAddress: String? = null,
+  @ColumnInfo(name = "from_addresses", defaultValue = "NULL") val fromAddresses: String? = null,
+  @ColumnInfo(name = "to_addresses", defaultValue = "NULL") val toAddresses: String? = null,
+  @ColumnInfo(name = "cc_addresses", defaultValue = "NULL") val ccAddresses: String? = null,
+  @ColumnInfo(
+    name = "reply_to_addresses",
+    defaultValue = "NULL"
+  ) val replyToAddresses: String? = null,
   @ColumnInfo(defaultValue = "NULL") val subject: String? = null,
   @ColumnInfo(defaultValue = "NULL") val flags: String? = null,
-  @ColumnInfo(
-    name = "is_message_has_attachments",
-    defaultValue = "0"
-  ) val hasAttachments: Boolean? = null,
-  @ColumnInfo(name = "is_encrypted", defaultValue = "-1") val isEncrypted: Boolean? = null,
+  @ColumnInfo(name = "has_attachments", defaultValue = "0") val hasAttachments: Boolean? = null,
   @ColumnInfo(name = "is_new", defaultValue = "-1") val isNew: Boolean? = null,
   @ColumnInfo(defaultValue = "-1") val state: Int? = null,
   @ColumnInfo(name = "attachments_directory") val attachmentsDirectory: String? = null,
-  @ColumnInfo(name = "error_msg", defaultValue = "NULL") val errorMsg: String? = null,
-  @ColumnInfo(name = "reply_to", defaultValue = "NULL") val replyTo: String? = null,
-  @ColumnInfo(name = "thread_id", defaultValue = "NULL") val threadId: String? = null,
-  @ColumnInfo(name = "history_id", defaultValue = "NULL") val historyId: String? = null,
+  @ColumnInfo(name = "error_message", defaultValue = "NULL") val errorMsg: String? = null,
   @ColumnInfo(name = "password", defaultValue = "NULL") val password: ByteArray? = null,
+  @ColumnInfo(name = "is_visible", defaultValue = "1") val isVisible: Boolean = true,
+  @ColumnInfo(name = "thread_id", defaultValue = "NULL") val threadId: Long? = null,
+  @ColumnInfo(name = "history_id", defaultValue = "NULL") val historyId: String? = null,
   @ColumnInfo(name = "draft_id", defaultValue = "NULL") val draftId: String? = null,
   @ColumnInfo(name = "label_ids", defaultValue = "NULL") val labelIds: String? = null,
+  @ColumnInfo(name = "is_encrypted", defaultValue = "-1") val isEncrypted: Boolean? = null,
   @ColumnInfo(name = "has_pgp", defaultValue = "0") val hasPgp: Boolean? = null,
+  @ColumnInfo(name = "thread_messages_count", defaultValue = "NULL") val threadMessagesCount: Int? = null,
+  @ColumnInfo(
+    name = "thread_drafts_count",
+    defaultValue = "NULL"
+  ) val threadDraftsCount: Int? = null,
+  @ColumnInfo(name = "snippet", defaultValue = "NULL") val snippet: String? = null,
 ) : Parcelable {
 
   @IgnoredOnParcel
   @Ignore
-  val from: List<InternetAddress> = fromAddress.asInternetAddresses().asList()
+  val from: List<InternetAddress> = fromAddresses.asInternetAddresses().asList()
 
   @IgnoredOnParcel
   @Ignore
-  val replyToAddress: List<InternetAddress> = replyTo.asInternetAddresses().asList()
+  val replyToAddress: List<InternetAddress> = replyToAddresses.asInternetAddresses().asList()
 
   @IgnoredOnParcel
   @Ignore
-  val to: List<InternetAddress> = toAddress.asInternetAddresses().asList()
+  val to: List<InternetAddress> = toAddresses.asInternetAddresses().asList()
 
   @IgnoredOnParcel
   @Ignore
-  val cc: List<InternetAddress> = ccAddress.asInternetAddresses().asList()
+  val cc: List<InternetAddress> = ccAddresses.asInternetAddresses().asList()
 
   @IgnoredOnParcel
   @Ignore
@@ -123,10 +162,18 @@ data class MessageEntity(
   @Ignore
   val uidAsHEX: String = uid.toHex()
 
+  @IgnoredOnParcel
+  @Ignore
+  val threadIdAsHEX = threadId?.toHex()
+
   @IgnoredOnParcel
   @Ignore
   val isPasswordProtected = password?.isNotEmpty() ?: false
 
+  @IgnoredOnParcel
+  @Ignore
+  val isGmailThread: Boolean = threadMessagesCount != null && threadMessagesCount > 0
+
   /**
    * Generate a list of the all recipients.
    *
@@ -158,70 +205,369 @@ data class MessageEntity(
     other as MessageEntity
 
     if (id != other.id) return false
-    if (email != other.email) return false
+    if (account != other.account) return false
+    if (accountType != other.accountType) return false
     if (folder != other.folder) return false
     if (uid != other.uid) return false
     if (receivedDate != other.receivedDate) return false
     if (sentDate != other.sentDate) return false
-    if (fromAddress != other.fromAddress) return false
-    if (toAddress != other.toAddress) return false
-    if (ccAddress != other.ccAddress) return false
+    if (fromAddresses != other.fromAddresses) return false
+    if (toAddresses != other.toAddresses) return false
+    if (ccAddresses != other.ccAddresses) return false
+    if (replyToAddresses != other.replyToAddresses) return false
     if (subject != other.subject) return false
     if (flags != other.flags) return false
     if (hasAttachments != other.hasAttachments) return false
-    if (isEncrypted != other.isEncrypted) return false
     if (isNew != other.isNew) return false
     if (state != other.state) return false
     if (attachmentsDirectory != other.attachmentsDirectory) return false
     if (errorMsg != other.errorMsg) return false
-    if (replyTo != other.replyTo) return false
-    if (threadId != other.threadId) return false
-    if (historyId != other.historyId) return false
     if (password != null) {
       if (other.password == null) return false
       if (!password.contentEquals(other.password)) return false
     } else if (other.password != null) return false
+    if (isVisible != other.isVisible) return false
+    if (threadId != other.threadId) return false
+    if (historyId != other.historyId) return false
     if (draftId != other.draftId) return false
     if (labelIds != other.labelIds) return false
+    if (isEncrypted != other.isEncrypted) return false
     if (hasPgp != other.hasPgp) return false
+    if (threadMessagesCount != other.threadMessagesCount) return false
+    if (threadDraftsCount != other.threadDraftsCount) return false
+    if (snippet != other.snippet) return false
+
     return true
   }
 
   override fun hashCode(): Int {
     var result = id?.hashCode() ?: 0
-    result = 31 * result + email.hashCode()
+    result = 31 * result + account.hashCode()
+    result = 31 * result + accountType.hashCode()
     result = 31 * result + folder.hashCode()
     result = 31 * result + uid.hashCode()
     result = 31 * result + (receivedDate?.hashCode() ?: 0)
     result = 31 * result + (sentDate?.hashCode() ?: 0)
-    result = 31 * result + (fromAddress?.hashCode() ?: 0)
-    result = 31 * result + (toAddress?.hashCode() ?: 0)
-    result = 31 * result + (ccAddress?.hashCode() ?: 0)
+    result = 31 * result + (fromAddresses?.hashCode() ?: 0)
+    result = 31 * result + (toAddresses?.hashCode() ?: 0)
+    result = 31 * result + (ccAddresses?.hashCode() ?: 0)
+    result = 31 * result + (replyToAddresses?.hashCode() ?: 0)
     result = 31 * result + (subject?.hashCode() ?: 0)
     result = 31 * result + (flags?.hashCode() ?: 0)
     result = 31 * result + (hasAttachments?.hashCode() ?: 0)
-    result = 31 * result + (isEncrypted?.hashCode() ?: 0)
     result = 31 * result + (isNew?.hashCode() ?: 0)
     result = 31 * result + (state ?: 0)
     result = 31 * result + (attachmentsDirectory?.hashCode() ?: 0)
     result = 31 * result + (errorMsg?.hashCode() ?: 0)
-    result = 31 * result + (replyTo?.hashCode() ?: 0)
+    result = 31 * result + (password?.contentHashCode() ?: 0)
+    result = 31 * result + isVisible.hashCode()
     result = 31 * result + (threadId?.hashCode() ?: 0)
     result = 31 * result + (historyId?.hashCode() ?: 0)
-    result = 31 * result + (password?.contentHashCode() ?: 0)
     result = 31 * result + (draftId?.hashCode() ?: 0)
     result = 31 * result + (labelIds?.hashCode() ?: 0)
+    result = 31 * result + (isEncrypted?.hashCode() ?: 0)
     result = 31 * result + (hasPgp?.hashCode() ?: 0)
+    result = 31 * result + (threadMessagesCount ?: 0)
+    result = 31 * result + (threadDraftsCount ?: 0)
+    result = 31 * result + (snippet?.hashCode() ?: 0)
     return result
   }
 
+  fun generateSenderAddresses(
+    context: Context,
+    folderType: FoldersManager.FolderType?,
+    meString: String
+  ): CharSequence {
+    val accountName = account
+    return when (folderType) {
+      FoldersManager.FolderType.SENT -> generateAddresses(
+        context = context,
+        accountName = accountName,
+        internetAddresses = if (isGmailThread) {
+          from
+        } else {
+          to
+        }
+      )
+
+      FoldersManager.FolderType.DRAFTS -> generateAddresses(
+        context = context,
+        accountName = accountName,
+        internetAddresses = if (isGmailThread) {
+          from
+        } else {
+          to
+        }
+      ).ifEmpty {
+        context.getString(R.string.no_recipients)
+      }.takeIf {
+        it != meString
+      } ?: ""
+
+      else -> generateAddresses(
+        context = context,
+        accountName = accountName,
+        internetAddresses = from
+      )
+    }
+  }
+
+  fun getThreadSpannableString(context: Context): SpannableStringBuilder {
+    return SpannableStringBuilder().apply {
+      val draftsCount = threadDraftsCount ?: 0
+      if (draftsCount > 0) {
+        val text = context.resources.getQuantityString(
+          R.plurals.drafts_count,
+          draftsCount, draftsCount
+        )
+        val color = UIUtil.getColor(context, R.color.red)
+        append(
+          SpannableString(text).apply {
+            setSpan(
+              ForegroundColorSpan(color), 0, text.length,
+              Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+          }
+        )
+      }
+
+      if ((threadMessagesCount ?: 0) > 1) {
+        if (isNotEmpty()) {
+          append(" ")
+        }
+
+        append(
+          SpannableString(
+            "(${threadMessagesCount})"
+          ).apply {
+            val textSize =
+              context.resources.getDimensionPixelSize(R.dimen.default_text_size_small)
+            setSpan(
+              AbsoluteSizeSpan(textSize),
+              0,
+              length,
+              Spanned.SPAN_INCLUSIVE_INCLUSIVE
+            )
+          }
+        )
+      }
+    }
+  }
+
+  fun generateToText(context: Context): String {
+    val allRecipients = to + cc
+    val meAddress = allRecipients.firstOrNull {
+      it.address.equals(account, true)
+    }
+    val sortedAllRecipients = if (meAddress == null) {
+      allRecipients
+    } else {
+      listOf(meAddress) + (allRecipients - listOf(meAddress).toSet())
+    }
+    val uniqueRecipientsMap = mutableMapOf<String, InternetAddress>()
+
+    sortedAllRecipients.forEach { internetAddress ->
+      val address = internetAddress.address.lowercase()
+
+      if (!uniqueRecipientsMap.contains(address)
+        || uniqueRecipientsMap[address]?.personal.isNullOrEmpty()
+      ) {
+        uniqueRecipientsMap[address] = internetAddress
+      }
+    }
+
+    return context.getString(
+      R.string.to_receiver,
+      uniqueRecipientsMap.values.joinToString {
+        if (it.address.equals(account, true)) {
+          context.getString(R.string.me)
+        } else {
+          it.personalOrEmail.split(" ").firstOrNull() ?: it.personalOrEmail
+        }
+      })
+  }
+
+  fun generateFromText(context: Context): String {
+    val fromAddress = from.firstOrNull() ?: return ""
+    return if (fromAddress.address.equals(account, true)) {
+      context.getString(R.string.me)
+    } else {
+      EmailUtil.getFirstAddressString(from)
+    }
+  }
+
+  fun getMessageEncryptionType(): MessageEncryptionType {
+    return if (hasPgp == true) {
+      MessageEncryptionType.ENCRYPTED
+    } else {
+      MessageEncryptionType.STANDARD
+    }
+  }
+
+  fun generateDetailsHeaders(context: Context): List<MessageHeadersListAdapter.Header> {
+    return mutableListOf<MessageHeadersListAdapter.Header>().apply {
+      add(
+        MessageHeadersListAdapter.Header(
+          name = context.getString(R.string.from),
+          value = formatAddresses(context, from)
+        )
+      )
+
+      if (replyToAddress.isNotEmpty()) {
+        add(
+          MessageHeadersListAdapter.Header(
+            name = context.getString(R.string.reply_to),
+            value = formatAddresses(context, replyToAddress)
+          )
+        )
+      }
+
+      add(
+        MessageHeadersListAdapter.Header(
+          name = context.getString(R.string.to),
+          value = formatAddresses(context, to).ifEmpty { context.getString(R.string.no_recipients) }
+        )
+      )
+
+      if (cc.isNotEmpty()) {
+        add(
+          MessageHeadersListAdapter.Header(
+            name = context.getString(R.string.cc),
+            value = formatAddresses(context, cc)
+          )
+        )
+      }
+
+      add(
+        MessageHeadersListAdapter.Header(
+          name = context.getString(R.string.date),
+          value = prepareDateHeaderValue(context)
+        )
+      )
+    }.toList()
+  }
+
+  fun appendDraftLabelIfNeeded(context: Context, charSequence: CharSequence): CharSequence {
+    return if (isDraft) {
+      SpannableStringBuilder(charSequence).apply {
+        append(" ")
+        val timeSpannable = SpannableString("(${context.getString(R.string.draft)})")
+        timeSpannable.setSpan(
+          ForegroundColorSpan(UIUtil.getColor(context, R.color.red)), 0, timeSpannable.length,
+          Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        append(timeSpannable)
+      }
+    } else charSequence
+  }
+
+  fun toUpdatedThreadCopy(messageEntity: MessageEntity, thread: GmailThreadInfo): MessageEntity {
+    return copy(
+      id = messageEntity.id,
+      uid = messageEntity.uid,
+      subject = thread.subject,
+      threadMessagesCount = thread.messagesCount,
+      threadDraftsCount = thread.draftsCount,
+      labelIds = thread.labels.joinToString(separator = LABEL_IDS_SEPARATOR),
+      hasAttachments = thread.hasAttachments,
+      fromAddresses = InternetAddress.toString(thread.recipients.toTypedArray()),
+      hasPgp = thread.hasPgpThings,
+      flags = if (thread.hasUnreadMessages) {
+        messageEntity.flags?.replace(MessageFlag.SEEN.value, "")
+      } else {
+        if (messageEntity.flags?.contains(MessageFlag.SEEN.value) == true) {
+          messageEntity.flags
+        } else {
+          messageEntity.flags.plus("${MessageFlag.SEEN.value} ")
+        }
+      }
+    )
+  }
+
+  private fun prepareDateHeaderValue(context: Context): String {
+    val dateInMilliseconds: Long =
+      if (JavaEmailConstants.FOLDER_OUTBOX.equals(folder, ignoreCase = true)) {
+        sentDate ?: 0
+      } else {
+        receivedDate ?: 0
+      }
+
+    val flags = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME or
+        DateUtils.FORMAT_SHOW_YEAR
+    return DateUtils.formatDateTime(context, dateInMilliseconds, flags)
+  }
+
+  private fun formatAddresses(context: Context, addresses: List<InternetAddress>) =
+    addresses.foldIndexed(SpannableStringBuilder()) { index, builder, it ->
+      val maxAllowedRecipientsInHeaderValue = 10
+      if (index < maxAllowedRecipientsInHeaderValue) {
+        builder.append(it.getFormattedString())
+        if (index != addresses.size - 1) {
+          builder.append("\n")
+        }
+      } else if (index == maxAllowedRecipientsInHeaderValue + 1) {
+        builder.append(context.getString(R.string.and_others))
+      }
+      builder
+    }.toSpannable()
+
+  private fun generateAddresses(
+    context: Context,
+    accountName: String,
+    internetAddresses: List<InternetAddress>?
+  ): String {
+    if (internetAddresses == null) {
+      return context.getString(R.string.no_recipients)
+    }
+
+    val mapOfUniqueInternetAddresses = mutableMapOf<String, InternetAddress>()
+    internetAddresses.forEach { internetAddress ->
+      val existingInternetAddress =
+        mapOfUniqueInternetAddresses[internetAddress.address.lowercase()]
+      if (existingInternetAddress == null || existingInternetAddress.personal?.isEmpty() == true) {
+        mapOfUniqueInternetAddresses[internetAddress.address.lowercase()] = internetAddress
+      }
+    }
+
+    val uniqueRecipients = mapOfUniqueInternetAddresses.values.map { internetAddress ->
+      if (accountName.equals(internetAddress.address, true)) {
+        context.getString(R.string.me)
+      } else {
+        if (internetAddress.personal.isNullOrEmpty()) {
+          internetAddress.address
+        } else {
+          internetAddress.personal
+        }
+      }
+    }.toSet()
+
+    return generateSenderName(uniqueRecipients.joinToString {
+      if (uniqueRecipients.size > 1) {
+        it.split(" ").firstOrNull() ?: it
+      } else it
+    })
+  }
+
+  /**
+   * Prepare the sender name.
+   *
+   * Remove common mail domains: gmail.com, yahoo.com, live.com, outlook.com
+   *
+   *
+   * @param name An incoming name
+   * @return A generated sender name.
+   */
+  private fun generateSenderName(name: String): String {
+    return SENDER_NAME_PATTERN.matcher(name).replaceFirst("")
+  }
+
   companion object {
-    const val TABLE_NAME = "messages"
     const val LABEL_IDS_SEPARATOR = " "
 
     fun genMessageEntities(
       context: Context,
-      email: String,
+      account: String,
+      accountType: String,
       label: String,
       folder: IMAPFolder,
       msgs: Array<Message>?,
@@ -264,7 +610,8 @@ data class MessageEntity(
 
             messageEntities.add(
               genMsgEntity(
-                email = email,
+                account = account,
+                accountType = accountType,
                 label = label,
                 msg = msg,
                 uid = folder.getUID(msg),
@@ -285,12 +632,17 @@ data class MessageEntity(
 
     fun genMessageEntities(
       context: Context,
-      email: String,
+      account: String,
+      accountType:String,
       label: String,
       msgsList: List<com.google.api.services.gmail.model.Message>,
       isNew: Boolean,
       onlyPgpModeEnabled: Boolean,
-      draftIdsMap: Map<String, String> = emptyMap()
+      draftIdsMap: Map<String, String> = emptyMap(),
+      messageModificationAction: (
+        message: com.google.api.services.gmail.model.Message,
+        messageEntity: MessageEntity
+      ) -> MessageEntity = { _, messageEntity -> messageEntity }
     ): List<MessageEntity> {
       val messageEntities = mutableListOf<MessageEntity>()
       val isNotificationDisabled = NotificationsSettingsFragment.NOTIFICATION_LEVEL_NEVER ==
@@ -325,21 +677,23 @@ data class MessageEntity(
           }
 
           val mimeMessage = GmaiAPIMimeMessage(Session.getInstance(Properties()), msg)
+          val messageEntityTemplate = genMsgEntity(
+            account = account,
+            accountType = accountType,
+            label = label,
+            msg = mimeMessage,
+            uid = msg.uid,
+            isNew = isNewTemp,
+            hasPgp = hasPgp,
+            hasAttachments = msg.hasAttachments()
+          ).copy(
+            threadId = msg.threadIdAsLong,
+            historyId = msg.historyId.toString(),
+            draftId = draftIdsMap[msg.id],
+            labelIds = msg.labelIds?.joinToString(separator = LABEL_IDS_SEPARATOR)
+          )
           messageEntities.add(
-            genMsgEntity(
-              email = email,
-              label = label,
-              msg = mimeMessage,
-              uid = msg.uid,
-              isNew = isNewTemp,
-              hasPgp = hasPgp,
-              hasAttachments = GmailApiHelper.getAttsInfoFromMessagePart(msg.payload).isNotEmpty()
-            ).copy(
-              threadId = msg.threadId,
-              historyId = msg.historyId.toString(),
-              draftId = draftIdsMap[msg.id],
-              labelIds = msg.labelIds?.joinToString(separator = LABEL_IDS_SEPARATOR)
-            )
+            messageModificationAction.invoke(msg, messageEntityTemplate)
           )
         } catch (e: MessageRemovedException) {
           e.printStackTrace()
@@ -355,7 +709,7 @@ data class MessageEntity(
      * Prepare the content values for insert to the database. This method must be called in the
      * non-UI thread.
      *
-     * @param email The email that the message linked.
+     * @param account The email that the message linked.
      * @param label The folder label.
      * @param msg   The message which will be added to the database.
      * @param uid   The message UID.
@@ -365,7 +719,8 @@ data class MessageEntity(
      * [Message] object
      */
     fun genMsgEntity(
-      email: String,
+      account: String,
+      accountType: String,
       label: String,
       msg: Message,
       uid: Long,
@@ -374,15 +729,17 @@ data class MessageEntity(
       hasPgp: Boolean? = null,
       hasAttachments: Boolean? = null
     ): MessageEntity {
-      return MessageEntity(email = email,
+      return MessageEntity(
+        account = account,
+        accountType = accountType,
         folder = label,
         uid = uid,
         receivedDate = msg.receivedDate?.time,
         sentDate = msg.sentDate?.time,
-        fromAddress = InternetAddress.toString(msg.from),
-        replyTo = InternetAddress.toString(msg.replyTo),
-        toAddress = InternetAddress.toString(msg.getRecipients(Message.RecipientType.TO)),
-        ccAddress = InternetAddress.toString(msg.getRecipients(Message.RecipientType.CC)),
+        fromAddresses = InternetAddress.toString(msg.from),
+        replyToAddresses = InternetAddress.toString(msg.replyTo),
+        toAddresses = InternetAddress.toString(msg.getRecipients(Message.RecipientType.TO)),
+        ccAddresses = InternetAddress.toString(msg.getRecipients(Message.RecipientType.CC)),
         subject = msg.subject,
         flags = msg.flags.toString().uppercase(),
         hasAttachments = hasAttachments?.let { hasAttachments } ?: EmailUtil.hasAtt(msg),
@@ -397,14 +754,16 @@ data class MessageEntity(
     }
 
     fun genMsgEntity(
-      email: String,
+      account: String,
+      accountType: String,
       label: String,
       uid: Long,
       info: OutgoingMessageInfo,
       flags: List<MessageFlag> = listOf(MessageFlag.SEEN)
     ): MessageEntity {
       return MessageEntity(
-        email = email,
+        account = account,
+        accountType = accountType,
         folder = label,
         uid = uid,
         sentDate = System.currentTimeMillis(),
@@ -415,7 +774,7 @@ data class MessageEntity(
     }
 
     fun generateColoredLabels(
-      labelIds: List<String>?,
+      labelIds: Collection<String>?,
       labelEntities: List<LabelEntity>?,
       skippedLabels: List<String> = emptyList()
     ): List<GmailApiLabelsListAdapter.Label> {
@@ -427,7 +786,7 @@ data class MessageEntity(
             ?: entity.alias.orEmpty()
           GmailApiLabelsListAdapter.Label(name, entity.labelColor, entity.textColor)
         }
-      }.sortedBy { it.name }
+      }.sortedBy { it.name.lowercase() }
     }
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/Context.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/Context.kt
index 258d847c74..72f1c8c629 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/Context.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/Context.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.extensions
@@ -10,6 +10,7 @@ import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
 import android.widget.Toast
+import com.flowcrypt.email.FlowCryptApplication
 
 /**
  * @author Denys Bondarenko
@@ -36,3 +37,12 @@ fun Context?.hasActiveConnection(): Boolean {
     }
   } ?: false
 }
+
+/**
+ * Check if the app is in the foreground or visible..
+ *
+ * @return true if the app is foregrounded or visible.
+ */
+fun Context?.isAppForegrounded(): Boolean {
+  return (this as? FlowCryptApplication)?.appForegroundedObserver?.isAppForegrounded ?: false
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/GmailAPIMessageExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/GmailAPIMessageExt.kt
index 3fc77b93f0..b040b673cf 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/GmailAPIMessageExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/GmailAPIMessageExt.kt
@@ -1,14 +1,18 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.extensions
 
+import com.flowcrypt.email.extensions.kotlin.toLongRadix16
 import com.google.api.services.gmail.model.Message
 
 /**
  * @author Denys Bondarenko
  */
 val Message.uid: Long
-  get() = id.toLong(radix = 16)
+  get() = id.toLongRadix16
+
+val Message.threadIdAsLong: Long
+  get() = threadId.toLongRadix16
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/LifecycleOwnerExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/LifecycleOwnerExt.kt
index 8440b17e77..269d31c580 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/LifecycleOwnerExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/LifecycleOwnerExt.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.extensions
@@ -111,7 +111,8 @@ fun LifecycleOwner.showNeedPassphraseDialog(
   logicType: Long = FixNeedPassphraseIssueDialogFragment.LogicType.AT_LEAST_ONE,
   requestCode: Int = 0,
   customTitle: String? = null,
-  showKeys: Boolean = true
+  showKeys: Boolean = true,
+  bundle: Bundle? = null
 ) {
   if (navController?.currentDestination?.id == R.id.fixNeedPassphraseIssueDialogFragment) {
     //it prevents blinking
@@ -127,7 +128,8 @@ fun LifecycleOwner.showNeedPassphraseDialog(
         logicType = logicType,
         requestCode = requestCode,
         customTitle = customTitle,
-        showKeys = showKeys
+        showKeys = showKeys,
+        bundle = bundle
       ).toBundle()
     }
   }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/MessagePartExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/MessagePartExt.kt
deleted file mode 100644
index a29ab08829..0000000000
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/MessagePartExt.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
- */
-
-package com.flowcrypt.email.extensions
-
-import com.google.api.services.gmail.model.MessagePart
-import jakarta.mail.internet.ContentDisposition
-import jakarta.mail.internet.ContentType
-import jakarta.mail.internet.ParseException
-
-/**
- * @author Denys Bondarenko
- */
-/**
- * This method is similar to [jakarta.mail.internet.MimeBodyPart.isMimeType]
- */
-fun MessagePart.isMimeType(inputMimeType: String): Boolean {
-  val type: String = mimeType
-  return try {
-    ContentType(type).match(inputMimeType)
-  } catch (ex: ParseException) {
-    // we only need the type and subtype so throw away the rest
-    try {
-      val i = type.indexOf(';')
-      if (i > 0) return ContentType(type.substring(0, i)).match(inputMimeType)
-    } catch (pex2: ParseException) {
-    }
-    type.equals(inputMimeType, ignoreCase = true)
-  }
-}
-
-/**
- * This method is similar to [jakarta.mail.internet.MimeBodyPart.getDisposition]
- */
-fun MessagePart.disposition(): String? {
-  try {
-    val value = headers?.firstOrNull { it.name.equals("Content-Disposition", true) }?.value
-      ?: return null
-    val cd = ContentDisposition(value)
-    return cd.disposition
-  } catch (e: Exception) {
-    //we can drop the exception and just return null
-    return null
-  }
-}
-
-fun MessagePart.contentId(): String? {
-  return headers?.firstOrNull { it.name.equals("Content-ID", true) }?.value
-}
-
-fun MessagePart.rawMimeType(): String? {
-  return headers?.firstOrNull { it.name.equals("Content-Type", true) }?.value
-}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/android/content/ContentValuesExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/android/content/ContentValuesExt.kt
new file mode 100644
index 0000000000..ec6ecd2eae
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/android/content/ContentValuesExt.kt
@@ -0,0 +1,49 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.extensions.android.content
+
+import android.content.ContentValues
+import android.database.Cursor
+
+/**
+ * @author Denys Bondarenko
+ */
+fun ContentValues.fillWithDataFromCursor(
+  cursor: Cursor,
+  skippedNames: Set<String> = emptySet(),
+  namesToBeRenamed: Map<String, String> = emptyMap()
+) {
+  for (name in cursor.columnNames) {
+    val columnIndex = cursor.getColumnIndex(name)
+    if (columnIndex == -1 || name in skippedNames) {
+      continue
+    }
+
+    val dataType = cursor.getType(columnIndex)
+    val finalName = namesToBeRenamed[name] ?: name
+    when (dataType) {
+      Cursor.FIELD_TYPE_BLOB -> {
+        put(finalName, cursor.getBlob(columnIndex))
+      }
+
+      Cursor.FIELD_TYPE_FLOAT -> {
+        put(finalName, cursor.getFloat(columnIndex))
+      }
+
+      Cursor.FIELD_TYPE_INTEGER -> {
+        put(finalName, cursor.getInt(columnIndex))
+      }
+
+      Cursor.FIELD_TYPE_NULL -> {
+        putNull(finalName)
+      }
+
+      Cursor.FIELD_TYPE_STRING -> {
+        put(finalName, cursor.getString(columnIndex))
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/fragment/app/FragmentExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/fragment/app/FragmentExt.kt
index 388bfd9df9..a64c3e7c9c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/fragment/app/FragmentExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/fragment/app/FragmentExt.kt
@@ -46,19 +46,19 @@ import kotlinx.coroutines.launch
  * @author Denys Bondarenko
  */
 
-val androidx.fragment.app.Fragment.appBarLayout: AppBarLayout?
+val Fragment.appBarLayout: AppBarLayout?
   get() = activity?.findViewById(R.id.appBarLayout)
 
-val androidx.fragment.app.Fragment.countingIdlingResource: CountingIdlingResource?
+val Fragment.countingIdlingResource: CountingIdlingResource?
   get() = FlavorSettings.getCountingIdlingResource()
 
-val androidx.fragment.app.Fragment.supportActionBar: ActionBar?
+val Fragment.supportActionBar: ActionBar?
   get() = if (activity is AppCompatActivity) {
     (activity as AppCompatActivity).supportActionBar
   } else
     null
 
-val androidx.fragment.app.Fragment.navController: NavController?
+val Fragment.navController: NavController?
   get() = activity?.let {
     try {
       Navigation.findNavController(it, R.id.fragmentContainerView)
@@ -67,24 +67,24 @@ val androidx.fragment.app.Fragment.navController: NavController?
     }
   }
 
-val androidx.fragment.app.Fragment.currentOnResultSavedStateHandle
+val Fragment.currentOnResultSavedStateHandle
   get() = navController?.currentBackStackEntry?.savedStateHandle
 
-fun androidx.fragment.app.Fragment.doBaseUISetup(uiUxSettings: UiUxSettings) {
+fun Fragment.doBaseUISetup(uiUxSettings: UiUxSettings) {
   (activity as? BaseActivity<*>)?.setDrawerLockMode(uiUxSettings.isSideMenuLocked)
   appBarLayout?.visibleOrGone(uiUxSettings.isToolbarVisible)
   supportActionBar?.setDisplayHomeAsUpEnabled(uiUxSettings.isDisplayHomeAsUpEnabled)
   supportActionBar?.subtitle = null
 }
 
-fun androidx.fragment.app.Fragment.getOnResultSavedStateHandle(destinationId: Int? = null) =
+fun Fragment.getOnResultSavedStateHandle(destinationId: Int? = null) =
   if (destinationId == null) {
     null
   } else {
     navController?.getBackStackEntry(destinationId)?.savedStateHandle
   }
 
-fun <T> androidx.fragment.app.Fragment.getNavigationResult(
+fun <T> Fragment.getNavigationResult(
   key: String,
   onResult: (result: T) -> Unit
 ) {
@@ -96,17 +96,17 @@ fun <T> androidx.fragment.app.Fragment.getNavigationResult(
     }
 }
 
-fun androidx.fragment.app.Fragment.toast(text: String?, duration: Int = Toast.LENGTH_SHORT) {
+fun Fragment.toast(text: String?, duration: Int = Toast.LENGTH_SHORT) {
   text?.let { context?.toast(text, duration) }
 }
 
-fun androidx.fragment.app.Fragment.toast(resId: Int, duration: Int = Toast.LENGTH_SHORT) {
+fun Fragment.toast(resId: Int, duration: Int = Toast.LENGTH_SHORT) {
   if (resId != -1) {
     context?.toast(resId, duration)
   }
 }
 
-fun androidx.fragment.app.Fragment.showInfoDialog(
+fun Fragment.showInfoDialog(
   requestKey: String? = GeneralUtil.generateUniqueExtraKey(
     Constants.REQUEST_KEY_INFO_BUTTON_CLICK,
     this::class.java
@@ -137,7 +137,7 @@ fun androidx.fragment.app.Fragment.showInfoDialog(
   )
 }
 
-fun androidx.fragment.app.Fragment.showTwoWayDialog(
+fun Fragment.showTwoWayDialog(
   requestKey: String? = GeneralUtil.generateUniqueExtraKey(
     Constants.REQUEST_KEY_BUTTON_CLICK,
     this::class.java
@@ -168,7 +168,7 @@ fun androidx.fragment.app.Fragment.showTwoWayDialog(
   )
 }
 
-fun androidx.fragment.app.Fragment.setFragmentResultListenerForTwoWayDialog(
+fun Fragment.setFragmentResultListenerForTwoWayDialog(
   requestKey: String = GeneralUtil.generateUniqueExtraKey(
     Constants.REQUEST_KEY_BUTTON_CLICK,
     this::class.java
@@ -179,7 +179,7 @@ fun androidx.fragment.app.Fragment.setFragmentResultListenerForTwoWayDialog(
   setFragmentResultListener(requestKey, useSuperParentFragmentManagerIfPossible, listener)
 }
 
-fun androidx.fragment.app.Fragment.setFragmentResultListenerForInfoDialog(
+fun Fragment.setFragmentResultListenerForInfoDialog(
   useSuperParentFragmentManagerIfPossible: Boolean = false,
   listener: ((requestKey: String, bundle: Bundle) -> Unit)
 ) {
@@ -190,22 +190,24 @@ fun androidx.fragment.app.Fragment.setFragmentResultListenerForInfoDialog(
   setFragmentResultListener(requestKey, useSuperParentFragmentManagerIfPossible, listener)
 }
 
-fun androidx.fragment.app.Fragment.showNeedPassphraseDialog(
+fun Fragment.showNeedPassphraseDialog(
   requestKey: String,
   fingerprints: List<String>,
   requestCode: Int = Int.MIN_VALUE,
-  logicType: Long = FixNeedPassphraseIssueDialogFragment.LogicType.AT_LEAST_ONE
+  logicType: Long = FixNeedPassphraseIssueDialogFragment.LogicType.AT_LEAST_ONE,
+  bundle: Bundle? = null
 ) {
   showNeedPassphraseDialog(
     requestKey = requestKey,
     requestCode = requestCode,
     navController = navController,
     fingerprints = fingerprints,
-    logicType = logicType
+    logicType = logicType,
+    bundle = bundle
   )
 }
 
-fun androidx.fragment.app.Fragment.showInfoDialogWithExceptionDetails(
+fun Fragment.showInfoDialogWithExceptionDetails(
   e: Throwable?,
   msgDetails: String? = null
 ) {
@@ -217,11 +219,11 @@ fun androidx.fragment.app.Fragment.showInfoDialogWithExceptionDetails(
   )
 }
 
-fun androidx.fragment.app.Fragment.showFeedbackFragment() {
+fun Fragment.showFeedbackFragment() {
   showFeedbackFragment(requireActivity(), navController)
 }
 
-fun androidx.fragment.app.Fragment.showFindKeysInClipboardDialogFragment(
+fun Fragment.showFindKeysInClipboardDialogFragment(
   requestKey: String,
   isPrivateKeyMode: Boolean
 ) {
@@ -236,7 +238,7 @@ fun androidx.fragment.app.Fragment.showFindKeysInClipboardDialogFragment(
   }
 }
 
-fun androidx.fragment.app.Fragment.showParsePgpKeysFromSourceDialogFragment(
+fun Fragment.showParsePgpKeysFromSourceDialogFragment(
   requestKey: String,
   source: String? = null,
   uri: Uri? = null,
@@ -255,12 +257,13 @@ fun androidx.fragment.app.Fragment.showParsePgpKeysFromSourceDialogFragment(
   }
 }
 
-fun androidx.fragment.app.Fragment.showChoosePublicKeyDialogFragment(
+fun Fragment.showChoosePublicKeyDialogFragment(
   requestKey: String,
   email: String,
   choiceMode: Int,
   titleResourceId: Int,
-  returnResultImmediatelyIfSingle: Boolean = false
+  returnResultImmediatelyIfSingle: Boolean = false,
+  bundle: Bundle? = null
 ) {
   showDialogFragment(navController) {
     return@showDialogFragment object : NavDirections {
@@ -270,7 +273,8 @@ fun androidx.fragment.app.Fragment.showChoosePublicKeyDialogFragment(
         email = email,
         choiceMode = choiceMode,
         titleResourceId = titleResourceId,
-        returnResultImmediatelyIfSingle = returnResultImmediatelyIfSingle
+        returnResultImmediatelyIfSingle = returnResultImmediatelyIfSingle,
+        bundle = bundle
       ).toBundle()
     }
   }
@@ -288,7 +292,7 @@ fun Fragment.setFragmentResultListener(
   }
 }
 
-inline fun androidx.fragment.app.Fragment.launchAndRepeatWithViewLifecycle(
+inline fun Fragment.launchAndRepeatWithViewLifecycle(
   minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
   crossinline block: suspend CoroutineScope.() -> Unit
 ) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/viewpager2/widget/ViewPager2Ext.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/viewpager2/widget/ViewPager2Ext.kt
index de6f909684..10c29f21f7 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/viewpager2/widget/ViewPager2Ext.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/androidx/viewpager2/widget/ViewPager2Ext.kt
@@ -1,12 +1,13 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.extensions.androidx.viewpager2.widget
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
+import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
 
 /**
  * @author Denys Bondarenko
@@ -19,7 +20,7 @@ import androidx.viewpager2.widget.ViewPager2
  * Origin:
  * https://medium.com/nerd-for-tech/android-webview-part-2-webview-on-top-viewpager2-639181e6d6f5
  */
-fun ViewPager2.reduceDragSensitivity() {
+fun ViewPager2.reduceDragSensitivity(factor: Int = 4) {
   try {
     val recyclerViewField = ViewPager2::class.java.getDeclaredField("mRecyclerView")
     recyclerViewField.isAccessible = true
@@ -28,8 +29,8 @@ fun ViewPager2.reduceDragSensitivity() {
     val touchSlopField = RecyclerView::class.java.getDeclaredField("mTouchSlop")
     touchSlopField.isAccessible = true
     val touchSlop = touchSlopField.get(recyclerView) as Int
-    touchSlopField.set(recyclerView, touchSlop * 8)
+    touchSlopField.set(recyclerView, touchSlop * factor)
   } catch (e: Exception) {
-    e.printStackTrace()
+    e.printStackTraceIfDebugOnly()
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/flowcrypt/email/util/DiskLruCacheSnapshotExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/flowcrypt/email/util/DiskLruCacheSnapshotExt.kt
new file mode 100644
index 0000000000..724d0aa790
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/flowcrypt/email/util/DiskLruCacheSnapshotExt.kt
@@ -0,0 +1,68 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.extensions.com.flowcrypt.email.util
+
+import android.content.Context
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.extensions.kotlin.processing
+import com.flowcrypt.email.security.pgp.PgpDecryptAndOrVerify
+import com.flowcrypt.email.security.pgp.PgpMsg
+import com.flowcrypt.email.util.cache.DiskLruCache
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.pgpainless.PGPainless
+import org.pgpainless.key.protection.PasswordBasedSecretKeyRingProtector
+import org.pgpainless.util.Passphrase
+
+/**
+ * @author Denys Bondarenko
+ */
+suspend fun DiskLruCache.Snapshot.processing(
+  context: Context,
+  accountEntity: AccountEntity,
+  skipAttachmentsRawData: Boolean = false,
+  preResultAction: suspend (blocks: List<MsgBlock>) -> Unit = {}
+): Result<PgpMsg.ProcessedMimeMessageResult?> = withContext(Dispatchers.IO) {
+  val uri = getUri(0)
+  if (uri != null) {
+    try {
+      val inputStream =
+        context.contentResolver.openInputStream(uri) ?: throw java.lang.IllegalStateException()
+
+      val keys = PGPainless.readKeyRing()
+        .secretKeyRingCollection(accountEntity.servicePgpPrivateKey)
+
+      val decryptionStream = PgpDecryptAndOrVerify.genDecryptionStream(
+        srcInputStream = inputStream,
+        secretKeys = keys,
+        protector = PasswordBasedSecretKeyRingProtector.forKey(
+          keys.first(),
+          Passphrase.fromPassword(accountEntity.servicePgpPassphrase)
+        )
+      )
+
+      val processedMimeMessage = PgpMsg.processMimeMessage(
+        context = context,
+        inputStream = decryptionStream,
+        skipAttachmentsRawData = skipAttachmentsRawData
+      )
+
+      preResultAction.invoke(processedMimeMessage.blocks)
+      return@withContext Result.success(processedMimeMessage)
+    } catch (e: Exception) {
+      return@withContext Result.exception(e)
+    }
+  } else {
+    return@withContext getByteArray(0).processing(
+      context = context,
+      skipAttachmentsRawData = skipAttachmentsRawData
+    ) { blocks ->
+      preResultAction.invoke(blocks)
+    }
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessageExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessageExt.kt
index 719a08af11..524350809c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessageExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessageExt.kt
@@ -6,8 +6,12 @@
 package com.flowcrypt.email.extensions.com.google.api.services.gmail.model
 
 import com.flowcrypt.email.api.email.EmailUtil
+import com.flowcrypt.email.api.email.JavaEmailConstants
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.extensions.kotlin.asContentTypeOrNull
+import com.flowcrypt.email.extensions.kotlin.asInternetAddresses
 import com.google.api.services.gmail.model.Message
+import jakarta.mail.internet.InternetAddress
 
 /**
  * @author Denys Bondarenko
@@ -40,4 +44,36 @@ fun Message.hasPgp(): Boolean {
       || isOpenPGPMimeSigned
       || isOpenPGPMimeEncrypted
       || hasEncryptedParts
+}
+
+fun Message.getRecipients(vararg recipientType: String): List<InternetAddress> {
+  return payload?.headers?.firstOrNull { header ->
+    header.name in recipientType
+  }?.value?.asInternetAddresses()?.toList() ?: emptyList()
+}
+
+fun Message.getSubject(): String? {
+  return payload?.headers?.firstOrNull { header ->
+    header.name == "Subject"
+  }?.value
+}
+
+fun Message.getInReplyTo(): String? {
+  return payload?.headers?.firstOrNull { header ->
+    header.name == JavaEmailConstants.HEADER_IN_REPLY_TO
+  }?.value
+}
+
+fun Message.getMessageId(): String? {
+  return payload?.headers?.firstOrNull { header ->
+    header.name == JavaEmailConstants.HEADER_MESSAGE_ID
+  }?.value
+}
+
+fun Message.isDraft(): Boolean {
+  return labelIds?.contains(GmailApiHelper.LABEL_DRAFT) ?: false
+}
+
+fun Message.hasAttachments(): Boolean {
+  return payload?.hasAttachments() ?: false
 }
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessagePartExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessagePartExt.kt
new file mode 100644
index 0000000000..66a4b16f9a
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/MessagePartExt.kt
@@ -0,0 +1,105 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.extensions.com.google.api.services.gmail.model
+
+import com.flowcrypt.email.api.email.EmailUtil
+import com.flowcrypt.email.api.email.JavaEmailConstants
+import com.flowcrypt.email.api.email.model.AttachmentInfo
+import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
+import com.google.api.services.gmail.model.MessagePart
+import jakarta.mail.Part
+import jakarta.mail.internet.ContentDisposition
+import jakarta.mail.internet.ContentType
+import jakarta.mail.internet.ParseException
+
+/**
+ * @author Denys Bondarenko
+ */
+
+fun MessagePart.hasAttachments(): Boolean {
+  return when {
+    parts?.isNotEmpty() == true -> {
+      parts?.any { part -> part.hasAttachments() } == true
+    }
+
+    Part.ATTACHMENT.equals(disposition(), ignoreCase = true) -> {
+      true
+    }
+
+    else -> false
+  }
+}
+
+/**
+ * Get information about attachments from the given [MessagePart]
+ *
+ * @param depth  The depth of the given [MessagePart]
+ * @return       a list of found attachments
+ */
+fun MessagePart.getAttachmentInfoList(depth: String = "0"): List<AttachmentInfo> {
+  val attachmentInfoList = mutableListOf<AttachmentInfo>()
+  if (isMimeType(JavaEmailConstants.MIME_TYPE_MULTIPART)) {
+    for ((index, part) in (parts ?: emptyList()).withIndex()) {
+      attachmentInfoList.addAll(
+        part.getAttachmentInfoList("$depth${AttachmentInfo.DEPTH_SEPARATOR}${index}")
+      )
+    }
+  } else if (Part.ATTACHMENT.equals(disposition(), ignoreCase = true)) {
+    val attachmentInfoBuilder = AttachmentInfo.Builder()
+    attachmentInfoBuilder.name = filename ?: depth
+    attachmentInfoBuilder.encodedSize = body?.getSize()?.toLong() ?: 0
+    attachmentInfoBuilder.type = mimeType ?: ""
+    attachmentInfoBuilder.id = contentId()
+      ?: EmailUtil.generateContentId(AttachmentInfo.INNER_ATTACHMENT_PREFIX)
+    attachmentInfoBuilder.path = depth
+    attachmentInfoList.add(attachmentInfoBuilder.build())
+  }
+
+  return attachmentInfoList
+}
+
+/**
+ * This method is similar to [jakarta.mail.internet.MimeBodyPart.isMimeType]
+ */
+fun MessagePart.isMimeType(inputMimeType: String): Boolean {
+  val type: String = mimeType
+  return try {
+    ContentType(type).match(inputMimeType)
+  } catch (ex: ParseException) {
+    // we only need the type and subtype so throw away the rest
+    try {
+      val i = type.indexOf(';')
+      if (i > 0) return ContentType(type.substring(0, i)).match(inputMimeType)
+    } catch (pex2: ParseException) {
+      pex2.printStackTraceIfDebugOnly()
+    }
+    type.equals(inputMimeType, ignoreCase = true)
+  }
+}
+
+/**
+ * This method is similar to [jakarta.mail.internet.MimeBodyPart.getDisposition]
+ */
+fun MessagePart.disposition(): String? {
+  try {
+    val value = headers?.firstOrNull { it.name.equals("Content-Disposition", true) }?.value
+      ?: return null
+    val cd = ContentDisposition(value)
+    return cd.disposition
+  } catch (e: Exception) {
+    e.printStackTraceIfDebugOnly()
+    //we can drop the exception and just return null
+    return null
+  }
+}
+
+fun MessagePart.contentId(): String? {
+  return headers?.firstOrNull { it.name.equals("Content-ID", true) }?.value
+}
+
+fun MessagePart.rawMimeType(): String? {
+  return headers?.firstOrNull { it.name.equals("Content-Type", true) }?.value
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt
new file mode 100644
index 0000000000..a10ef7d29a
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt
@@ -0,0 +1,119 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.extensions.com.google.api.services.gmail.model
+
+import android.content.Context
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper.Companion.LABEL_DRAFT
+import com.flowcrypt.email.api.email.gmail.model.GmailThreadInfo
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.extensions.kotlin.asInternetAddresses
+import com.google.api.services.gmail.model.Thread
+import jakarta.mail.internet.InternetAddress
+
+/**
+ * @author Denys Bondarenko
+ */
+fun Thread.getUniqueRecipients(account: String): List<InternetAddress> {
+  return mutableListOf<InternetAddress>().apply {
+    val filteredHeaders = messages?.flatMap { message ->
+      if (message?.payload?.headers?.any {
+          it.name in listOf(
+            "From",
+            "To",
+            "Cc",
+            "Delivered-To"
+          ) && it.value.contains(account, true)
+        } == true) {
+        message.payload?.headers?.filter { header ->
+          header.name == "From"
+        } ?: emptyList()
+      } else emptyList()
+    }
+
+    val mapOfUniqueRecipients = mutableMapOf<String, InternetAddress>()
+    filteredHeaders?.forEach { header ->
+      header.value.asInternetAddresses().forEach { internetAddress ->
+        val address = internetAddress.address.lowercase()
+
+        if (!mapOfUniqueRecipients.contains(address)
+          || mapOfUniqueRecipients[address]?.personal.isNullOrEmpty()
+        ) {
+          mapOfUniqueRecipients[address] = internetAddress
+        }
+      }
+    }
+
+    addAll(mapOfUniqueRecipients.values)
+  }
+}
+
+fun Thread.getUniqueLabelsSet(): Set<String> {
+  return messages?.flatMap { message ->
+    message.labelIds ?: emptyList()
+  }?.toSortedSet() ?: emptySet()
+}
+
+fun Thread.getDraftsCount(): Int {
+  return messages?.filter { it.labelIds.contains(LABEL_DRAFT) }?.size ?: 0
+}
+
+fun Thread.hasUnreadMessages(): Boolean {
+  return messages?.any { message ->
+    message.labelIds?.contains(GmailApiHelper.LABEL_UNREAD) == true
+  } ?: false
+}
+
+fun Thread.hasAttachments(): Boolean {
+  return messages?.any { message ->
+    message.hasAttachments()
+  } ?: false
+}
+
+fun Thread.hasPgp(): Boolean {
+  return messages?.any { message ->
+    message.hasPgp()
+  } ?: false
+}
+
+fun Thread.extractSubject(context: Context, receiverEmail: String): String {
+  return messages?.getOrNull(0)?.takeIf { message ->
+    (message.getRecipients("From").any { internetAddress ->
+      internetAddress.address.equals(receiverEmail, true)
+    } || (messages?.size ?: 0) == 1) && !message.isDraft()
+  }?.getSubject()
+    ?: messages.firstOrNull { message ->
+      message.getRecipients("From").any { internetAddress ->
+        internetAddress.address.equals(receiverEmail, true)
+      } && !message.isDraft()
+    }?.getSubject()
+    ?: messages?.getOrNull(0)?.getSubject()
+    ?: context.getString(R.string.no_subject)
+}
+
+fun Thread.toThreadInfo(
+  context: Context,
+  accountEntity: AccountEntity
+): GmailThreadInfo {
+  val receiverEmail = accountEntity.email
+  val gmailThreadInfo = GmailThreadInfo(
+    id = id,
+    lastMessage = requireNotNull(
+      messages?.lastOrNull {
+        !it.labelIds.contains(LABEL_DRAFT)
+      } ?: messages.first()),
+    messagesCount = messages?.size ?: 0,
+    draftsCount = getDraftsCount(),
+    recipients = getUniqueRecipients(receiverEmail),
+    subject = extractSubject(context, receiverEmail),
+    labels = getUniqueLabelsSet(),
+    hasAttachments = hasAttachments(),
+    hasPgpThings = hasPgp(),
+    hasUnreadMessages = hasUnreadMessages()
+  )
+  return gmailThreadInfo
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/ByteArrayExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/ByteArrayExt.kt
new file mode 100644
index 0000000000..0a7baf7f4c
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/ByteArrayExt.kt
@@ -0,0 +1,38 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.extensions.kotlin
+
+import android.content.Context
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
+import com.flowcrypt.email.security.pgp.PgpMsg
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+/**
+ * @author Denys Bondarenko
+ */
+suspend fun ByteArray.processing(
+  context: Context,
+  skipAttachmentsRawData: Boolean = false,
+  preResultAction: suspend (blocks: List<MsgBlock>) -> Unit = {}
+): Result<PgpMsg.ProcessedMimeMessageResult?> = withContext(Dispatchers.IO) {
+  return@withContext if (isEmpty()) {
+    Result.exception(throwable = IllegalArgumentException("empty byte array"))
+  } else {
+    try {
+      val processedMimeMessageResult = PgpMsg.processMimeMessage(
+        context = context,
+        inputStream = inputStream(),
+        skipAttachmentsRawData = skipAttachmentsRawData
+      )
+      preResultAction.invoke(processedMimeMessageResult.blocks)
+      return@withContext Result.success(processedMimeMessageResult)
+    } catch (e: Exception) {
+      return@withContext Result.exception(throwable = e)
+    }
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
index 015c0379d4..4c9a937143 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
@@ -1,7 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors:
- *   Ivan Pizhenko
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.extensions.kotlin
@@ -10,6 +9,7 @@ import android.content.Context
 import android.graphics.Color
 import android.util.Patterns
 import android.util.TypedValue
+import android.webkit.MimeTypeMap
 import androidx.core.content.ContextCompat
 import com.flowcrypt.email.R
 import com.flowcrypt.email.util.BetterInternetAddress
@@ -17,6 +17,7 @@ import com.flowcrypt.email.util.UIUtil
 import jakarta.mail.internet.AddressException
 import jakarta.mail.internet.ContentType
 import jakarta.mail.internet.InternetAddress
+import org.apache.commons.io.FilenameUtils
 import org.json.JSONObject
 import java.io.InputStream
 import java.net.URLDecoder
@@ -183,4 +184,18 @@ fun String?.asContentTypeOrNull(): ContentType? {
   } catch (e: Exception) {
     null
   }
+}
+
+fun String?.getPossibleAndroidMimeType(): String? {
+  return MimeTypeMap.getSingleton()
+    .getMimeTypeFromExtension(FilenameUtils.getExtension(this).lowercase())
+}
+
+val String.toLongRadix16: Long
+  get() = toLong(radix = 16)
+
+fun String.clip(context: Context, maxSize: Int): String {
+  return if (length > maxSize) {
+    take(maxSize) + "\n\n" + context.getString(R.string.clipped_message_too_large)
+  } else this
 }
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
index 688f49e564..b52387be97 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.viewmodel
@@ -10,34 +10,21 @@ import android.content.ContentResolver
 import androidx.lifecycle.viewModelScope
 import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.email.model.OutgoingMessageInfo
-import com.flowcrypt.email.api.retrofit.ApiClientRepository
-import com.flowcrypt.email.api.retrofit.response.attester.PubResponse
-import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.Result
-import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.RecipientEntity
-import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
 import com.flowcrypt.email.extensions.kotlin.isValidEmail
 import com.flowcrypt.email.model.MessageEncryptionType
-import com.flowcrypt.email.security.model.PgpKeyRingDetails
-import com.flowcrypt.email.security.pgp.PgpKey
-import com.flowcrypt.email.ui.adapter.RecipientChipRecyclerViewAdapter.RecipientInfo
-import com.flowcrypt.email.util.exception.ApiException
+import com.flowcrypt.email.ui.adapter.RecipientChipRecyclerViewAdapter.RecipientItem
+import com.flowcrypt.email.util.RecipientLookUpManager
 import jakarta.mail.Message
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.IOException
 import java.io.InvalidObjectException
-import java.util.concurrent.ConcurrentHashMap
 
 /**
  * @author Denys Bondarenko
@@ -46,12 +33,20 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
   AccountViewModel(application) {
   private val recipientLookUpManager = RecipientLookUpManager(
     application = application,
-    roomDatabase = roomDatabase,
-    viewModelScope = viewModelScope
-  ) {
-    replaceRecipient(Message.RecipientType.TO, it)
-    replaceRecipient(Message.RecipientType.CC, it)
-    replaceRecipient(Message.RecipientType.BCC, it)
+    roomDatabase = roomDatabase
+  ) { recipientInfo ->
+    val recipientItem = RecipientItem(
+      recipientInfo.recipientType,
+      recipientInfo.recipientWithPubKeys,
+      recipientInfo.creationTime,
+      recipientInfo.isUpdating,
+      recipientInfo.isUpdateFailed,
+      recipientInfo.isModifyingEnabled,
+    )
+
+    replaceRecipient(Message.RecipientType.TO, recipientItem)
+    replaceRecipient(Message.RecipientType.CC, recipientItem)
+    replaceRecipient(Message.RecipientType.BCC, recipientItem)
   }
 
   private val messageEncryptionTypeMutableStateFlow: MutableStateFlow<MessageEncryptionType> =
@@ -70,19 +65,19 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
   val webPortalPasswordStateFlow: StateFlow<CharSequence> =
     webPortalPasswordMutableStateFlow.asStateFlow()
 
-  private val recipientsToMutableStateFlow: MutableStateFlow<MutableMap<String, RecipientInfo>> =
+  private val recipientsToMutableStateFlow: MutableStateFlow<MutableMap<String, RecipientItem>> =
     MutableStateFlow(mutableMapOf())
-  val recipientsToStateFlow: StateFlow<Map<String, RecipientInfo>> =
+  val recipientsToStateFlow: StateFlow<Map<String, RecipientItem>> =
     recipientsToMutableStateFlow.asStateFlow()
 
-  private val recipientsCcMutableStateFlow: MutableStateFlow<MutableMap<String, RecipientInfo>> =
+  private val recipientsCcMutableStateFlow: MutableStateFlow<MutableMap<String, RecipientItem>> =
     MutableStateFlow(mutableMapOf())
-  val recipientsCcStateFlow: StateFlow<Map<String, RecipientInfo>> =
+  val recipientsCcStateFlow: StateFlow<Map<String, RecipientItem>> =
     recipientsCcMutableStateFlow.asStateFlow()
 
-  private val recipientsBccMutableStateFlow: MutableStateFlow<MutableMap<String, RecipientInfo>> =
+  private val recipientsBccMutableStateFlow: MutableStateFlow<MutableMap<String, RecipientItem>> =
     MutableStateFlow(mutableMapOf())
-  val recipientsBccStateFlow: StateFlow<Map<String, RecipientInfo>> =
+  val recipientsBccStateFlow: StateFlow<Map<String, RecipientItem>> =
     recipientsBccMutableStateFlow.asStateFlow()
 
   val recipientsStateFlow = combine(
@@ -95,13 +90,13 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
 
   val msgEncryptionType: MessageEncryptionType
     get() = messageEncryptionTypeStateFlow.value
-  val recipientsTo: Map<String, RecipientInfo>
+  val recipientsTo: Map<String, RecipientItem>
     get() = recipientsToStateFlow.value
-  val recipientsCc: Map<String, RecipientInfo>
+  val recipientsCc: Map<String, RecipientItem>
     get() = recipientsCcStateFlow.value
-  val recipientsBcc: Map<String, RecipientInfo>
+  val recipientsBcc: Map<String, RecipientItem>
     get() = recipientsBccStateFlow.value
-  val allRecipients: Map<String, RecipientInfo>
+  val allRecipients: Map<String, RecipientItem>
     get() = recipientsTo + recipientsCc + recipientsBcc
 
   val hasAttachmentsWithExternalStorageUri: Boolean
@@ -179,17 +174,17 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
         } else null
 
       existingRecipient?.let {
-        val recipientInfo = RecipientInfo(recipientType, it)
+        val recipientItem = RecipientItem(recipientType, it)
         when (recipientType) {
           Message.RecipientType.TO -> recipientsToMutableStateFlow
           Message.RecipientType.CC -> recipientsCcMutableStateFlow
           Message.RecipientType.BCC -> recipientsBccMutableStateFlow
           else -> throw InvalidObjectException("unknown RecipientType: $recipientType")
         }.update { map ->
-          map.toMutableMap().apply { put(normalizedEmail, RecipientInfo(recipientType, it)) }
+          map.toMutableMap().apply { put(normalizedEmail, RecipientItem(recipientType, it)) }
         }
 
-        recipientLookUpManager.enqueue(recipientInfo)
+        recipientLookUpManager.enqueue(recipientItem.toRecipientInfo())
       }
     }
   }
@@ -247,7 +242,7 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
   fun callLookUpForMissedPubKeys() {
     viewModelScope.launch {
       allRecipients.forEach { entry ->
-        recipientLookUpManager.enqueue(entry.value)
+        recipientLookUpManager.enqueue(entry.value.toRecipientInfo())
       }
     }
   }
@@ -256,220 +251,24 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
     viewModelScope.launch {
       allRecipients.entries
         .firstOrNull { it.key.equals(email?.lowercase(), ignoreCase = true) }
-        ?.value?.let { recipientLookUpManager.enqueue(it) }
+        ?.value?.let { recipientLookUpManager.enqueue(it.toRecipientInfo()) }
     }
   }
 
   private fun replaceRecipient(
     recipientType: Message.RecipientType,
-    recipientInfo: RecipientInfo
+    recipientItem: RecipientItem
   ) {
     viewModelScope.launch {
-      val normalizedEmail = recipientInfo.recipientWithPubKeys.recipient.email
+      val normalizedEmail = recipientItem.recipientWithPubKeys.recipient.email
       when (recipientType) {
         Message.RecipientType.TO -> recipientsToMutableStateFlow
         Message.RecipientType.CC -> recipientsCcMutableStateFlow
         Message.RecipientType.BCC -> recipientsBccMutableStateFlow
         else -> throw InvalidObjectException("unknown RecipientType: $recipientType")
       }.update { map ->
-        map.toMutableMap().apply { replace(normalizedEmail, recipientInfo) }
-      }
-    }
-  }
-
-  class RecipientLookUpManager(
-    private val application: Application,
-    private val roomDatabase: FlowCryptRoomDatabase,
-    private val viewModelScope: CoroutineScope,
-    private val updateListener: (recipientInfo: RecipientInfo) -> Unit
-  ) {
-    private val lookUpCandidates = ConcurrentHashMap<String, RecipientInfo>()
-    private val recipientsSessionCache = ConcurrentHashMap<String, RecipientWithPubKeys>()
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    private val lookUpLimitedParallelismDispatcher =
-      Dispatchers.IO.limitedParallelism(PARALLELISM_COUNT)
-
-    suspend fun enqueue(recipientInfo: RecipientInfo) = withContext(Dispatchers.IO) {
-      viewModelScope.launch {
-        val email = recipientInfo.recipientWithPubKeys.recipient.email
-        if (recipientsSessionCache.containsKey(email)) {
-          //we return a value from the session cache
-          updateListener.invoke(
-            recipientInfo.copy(
-              isUpdating = false,
-              recipientWithPubKeys = requireNotNull(recipientsSessionCache[email])
-            )
-          )
-        } else {
-          lookUpCandidates[email] = recipientInfo
-          if (!recipientInfo.isUpdating) {
-            updateListener.invoke(recipientInfo.copy(isUpdating = true))
-          }
-          try {
-            val recipientWithPubKeysAfterLookUp = lookUp(email)
-            dequeue(email)
-            if (recipientWithPubKeysAfterLookUp.hasUsablePubKey()) {
-              recipientsSessionCache[email] = recipientWithPubKeysAfterLookUp
-            }
-            updateListener.invoke(
-              recipientInfo.copy(
-                isUpdating = false,
-                recipientWithPubKeys = recipientWithPubKeysAfterLookUp
-              )
-            )
-          } catch (e: Exception) {
-            e.printStackTrace()
-            updateListener.invoke(recipientInfo.copy(isUpdating = false))
-          }
-        }
-      }
-    }
-
-    private suspend fun lookUp(email: String): RecipientWithPubKeys = withContext(Dispatchers.IO) {
-      val emailLowerCase = email.lowercase()
-      var cachedRecipientWithPubKeys = getCachedRecipientWithPubKeys(emailLowerCase)
-      if (cachedRecipientWithPubKeys == null) {
-        roomDatabase.recipientDao().insertSuspend(RecipientEntity(email = emailLowerCase))
-        cachedRecipientWithPubKeys =
-          roomDatabase.recipientDao().getRecipientWithPubKeysByEmailSuspend(emailLowerCase)
-      }
-
-      getPublicKeysFromRemoteServersInternal(email = emailLowerCase)?.let { pgpKeyDetailsList ->
-        cachedRecipientWithPubKeys?.let { recipientWithPubKeys ->
-          updateCachedInfoWithPubKeysFromLookUp(
-            recipientWithPubKeys,
-            pgpKeyDetailsList
-          )
-        }
+        map.toMutableMap().apply { replace(normalizedEmail, recipientItem) }
       }
-      cachedRecipientWithPubKeys = getCachedRecipientWithPubKeys(emailLowerCase)
-
-      return@withContext requireNotNull(cachedRecipientWithPubKeys)
-    }
-
-    fun dequeue(email: String) {
-      lookUpCandidates.remove(email)
-    }
-
-    private suspend fun getCachedRecipientWithPubKeys(emailLowerCase: String): RecipientWithPubKeys? =
-      withContext(Dispatchers.IO) {
-        val cachedRecipientWithPubKeys = roomDatabase.recipientDao()
-          .getRecipientWithPubKeysByEmailSuspend(emailLowerCase) ?: return@withContext null
-
-        for (publicKeyEntity in cachedRecipientWithPubKeys.publicKeys) {
-          try {
-            val result = PgpKey.parseKeys(source = publicKeyEntity.publicKey).pgpKeyDetailsList
-            publicKeyEntity.pgpKeyRingDetails = result.firstOrNull()
-          } catch (e: Exception) {
-            e.printStackTrace()
-            publicKeyEntity.isNotUsable = true
-          }
-        }
-        return@withContext cachedRecipientWithPubKeys
-      }
-
-    private suspend fun getPublicKeysFromRemoteServersInternal(email: String):
-        List<PgpKeyRingDetails>? = withContext(Dispatchers.IO) {
-      try {
-        val activeAccount = roomDatabase.accountDao().getActiveAccountSuspend()
-        if (!lookUpCandidates.containsKey(email)) {
-          return@withContext null
-        }
-        val response = pubLookup(email, activeAccount)
-
-        when (response.status) {
-          Result.Status.SUCCESS -> {
-            val sourceString = response.data?.pubkey
-            if (sourceString?.isNotEmpty() == true) {
-              val parsedResult = PgpKey.parseKeys(source = sourceString).pgpKeyDetailsList
-              if (parsedResult.isNotEmpty()) {
-                return@withContext parsedResult
-              }
-            }
-          }
-
-          Result.Status.ERROR -> {
-            throw ApiException(
-              response.apiError ?: ApiError(
-                code = -1,
-                message = "Unknown API error"
-              )
-            )
-          }
-
-          else -> {
-            throw response.exception ?: java.lang.Exception()
-          }
-        }
-      } catch (e: IOException) {
-        e.printStackTrace()
-      }
-
-      null
-    }
-
-    private suspend fun pubLookup(
-      email: String,
-      activeAccount: AccountEntity?
-    ): Result<PubResponse> = withContext(lookUpLimitedParallelismDispatcher) {
-      return@withContext ApiClientRepository.PubLookup.fetchPubKey(
-        context = application,
-        email = email,
-        clientConfiguration = activeAccount?.clientConfiguration
-      )
-    }
-
-    private suspend fun updateCachedInfoWithPubKeysFromLookUp(
-      cachedRecipientEntity: RecipientWithPubKeys,
-      fetchedPgpKeyRingDetailsList: List<PgpKeyRingDetails>
-    ) = withContext(Dispatchers.IO) {
-      val email = cachedRecipientEntity.recipient.email
-      val uniqueMapOfFetchedPubKeys =
-        deduplicateFetchedPubKeysByFingerprint(fetchedPgpKeyRingDetailsList)
-
-      val deDuplicatedListOfFetchedPubKeys = uniqueMapOfFetchedPubKeys.values
-      for (fetchedPgpKeyDetails in deDuplicatedListOfFetchedPubKeys) {
-        val existingPublicKeyEntity = cachedRecipientEntity.publicKeys.firstOrNull {
-          it.fingerprint == fetchedPgpKeyDetails.fingerprint
-        }
-        val existingPgpKeyDetails = existingPublicKeyEntity?.pgpKeyRingDetails
-        if (existingPgpKeyDetails != null) {
-          val isExistingKeyRevoked = existingPgpKeyDetails.isRevoked
-          if (!isExistingKeyRevoked && fetchedPgpKeyDetails.isNewerThan(existingPgpKeyDetails)) {
-            roomDatabase.pubKeyDao().updateSuspend(
-              existingPublicKeyEntity.copy(publicKey = fetchedPgpKeyDetails.publicKey.toByteArray())
-            )
-          }
-        } else {
-          roomDatabase.pubKeyDao()
-            .insertWithReplaceSuspend(fetchedPgpKeyDetails.toPublicKeyEntity(email))
-        }
-      }
-    }
-
-    private fun deduplicateFetchedPubKeysByFingerprint(
-      fetchedPgpKeyRingDetailsList: List<PgpKeyRingDetails>
-    ): Map<String, PgpKeyRingDetails> {
-      val uniqueMapOfFetchedPubKeys = mutableMapOf<String, PgpKeyRingDetails>()
-
-      for (fetchedPgpKeyDetails in fetchedPgpKeyRingDetailsList) {
-        val fetchedFingerprint = fetchedPgpKeyDetails.fingerprint
-        val alreadyEncounteredFetchedPgpKeyDetails = uniqueMapOfFetchedPubKeys[fetchedFingerprint]
-        if (alreadyEncounteredFetchedPgpKeyDetails == null) {
-          uniqueMapOfFetchedPubKeys[fetchedFingerprint] = fetchedPgpKeyDetails
-        } else {
-          if (fetchedPgpKeyDetails.isNewerThan(alreadyEncounteredFetchedPgpKeyDetails)) {
-            uniqueMapOfFetchedPubKeys[fetchedFingerprint] = fetchedPgpKeyDetails
-          }
-        }
-      }
-
-      return uniqueMapOfFetchedPubKeys
-    }
-
-    companion object {
-      const val PARALLELISM_COUNT = 10
     }
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CreateOutgoingMessageViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CreateOutgoingMessageViewModel.kt
index e6f0cd426b..f088e6919f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CreateOutgoingMessageViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CreateOutgoingMessageViewModel.kt
@@ -66,31 +66,37 @@ class CreateOutgoingMessageViewModel(
         val activeAccount = getActiveAccountSuspend()
           ?: throw IllegalStateException("No active account")
 
-        val replyTo = outgoingMessageInfo.replyToMessageEntityId?.let {
-          roomDatabase.msgDao().getMsgById(it)?.replyTo
+        val replyToMessageEntity = outgoingMessageInfo.replyToMessageEntityId?.let {
+          roomDatabase.msgDao().getMsgById(it)
         }
-        messageEntity = outgoingMessageInfo.toMessageEntity(
+        val template = outgoingMessageInfo.toMessageEntity(
           folder = JavaEmailConstants.FOLDER_OUTBOX,
           flags = Flags(Flags.Flag.SEEN),
-          replyTo = replyTo,
+          replyTo = replyToMessageEntity?.replyToAddresses,
           password = outgoingMessageInfo.password?.let {
             KeyStoreCryptoManager.encrypt(String(it)).toByteArray()
           }
         )
+
+        messageEntity = if (replyToMessageEntity != null) {
+          template.copy(threadId = replyToMessageEntity.threadId)
+        } else {
+          template
+        }
+
         val messageId = roomDatabase.msgDao().insertSuspend(messageEntity)
-        messageEntity = messageEntity.copy(id = messageId, uid = messageId)
+        messageEntity = messageEntity.copy(id = messageId, uid = outgoingMessageInfo.uid)
         roomDatabase.msgDao().updateSuspend(messageEntity)
 
         updateOutgoingMsgCount(activeAccount.email, activeAccount.accountType)
         ProcessingOutgoingMessageInfoHelper.process(
           context = context,
           originalOutgoingMessageInfo = outgoingMessageInfo.copy(
-            uid = messageId,
             atts = outgoingMessageInfo.atts?.map {
               it.copy(
                 email = outgoingMessageInfo.account,
                 folder = JavaEmailConstants.FOLDER_OUTBOX,
-                uid = messageId,
+                uid = messageEntity.uid,
                 type = it.type.ifEmpty { Constants.MIME_TYPE_BINARY_DATA }
               )
             },
@@ -98,7 +104,7 @@ class CreateOutgoingMessageViewModel(
               it.copy(
                 email = outgoingMessageInfo.account,
                 folder = JavaEmailConstants.FOLDER_OUTBOX,
-                uid = messageId,
+                uid = messageEntity.uid,
                 fwdFolder = it.folder,
                 fwdUid = it.uid,
                 type = it.type.ifEmpty { Constants.MIME_TYPE_BINARY_DATA }
@@ -117,7 +123,7 @@ class CreateOutgoingMessageViewModel(
             DownloadForwardedAttachmentsWorker.enqueue(context)
           } else {
             val existingMsgEntity = roomDatabase.msgDao().getMsg(
-              messageEntity.email, messageEntity.folder, messageEntity.uid
+              messageEntity.account, messageEntity.folder, messageEntity.uid
             ) ?: throw IllegalStateException("A message is not exist")
             if (outgoingMessageInfo.encryptionType == MessageEncryptionType.ENCRYPTED
               && outgoingMessageInfo.isPasswordProtected == true
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DecryptDownloadedAttachmentsBeforeForwardingViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DecryptDownloadedAttachmentsBeforeForwardingViewModel.kt
index 4de0536670..370fa3eae4 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DecryptDownloadedAttachmentsBeforeForwardingViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DecryptDownloadedAttachmentsBeforeForwardingViewModel.kt
@@ -7,13 +7,13 @@ package com.flowcrypt.email.jetpack.viewmodel
 
 import android.app.Application
 import android.content.Context
-import android.webkit.MimeTypeMap
 import androidx.lifecycle.viewModelScope
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
+import com.flowcrypt.email.extensions.kotlin.getPossibleAndroidMimeType
 import com.flowcrypt.email.providers.EmbeddedAttachmentsProvider
 import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
 import kotlinx.coroutines.Dispatchers
@@ -82,9 +82,7 @@ class DecryptDownloadedAttachmentsBeforeForwardingViewModel(
 
           val attachmentInfoWithDecryptedData = attachmentInfo.copy(
             rawData = decryptedData,
-            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
-              FilenameUtils.getExtension(newFileName).lowercase()
-            ) ?: Constants.MIME_TYPE_BINARY_DATA,
+            type = newFileName.getPossibleAndroidMimeType() ?: Constants.MIME_TYPE_BINARY_DATA,
             name = newFileName
           )
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DeleteDraftViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DeleteDraftViewModel.kt
new file mode 100644
index 0000000000..57a178bcfd
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DeleteDraftViewModel.kt
@@ -0,0 +1,147 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.jetpack.viewmodel
+
+import android.app.Application
+import android.content.Context
+import androidx.lifecycle.viewModelScope
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper
+import com.flowcrypt.email.api.email.model.MessageFlag
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.database.entity.MessageEntity.Companion.LABEL_IDS_SEPARATOR
+import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
+import com.google.api.services.gmail.model.Thread
+import jakarta.mail.internet.InternetAddress
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.launch
+
+/**
+ * @author Denys Bondarenko
+ */
+class DeleteDraftViewModel(
+  private val messageEntityId: Long,
+  application: Application
+) : AccountViewModel(application) {
+  private val triggerMutableStateFlow: MutableStateFlow<Trigger> = MutableStateFlow(Trigger())
+  private val triggerStateFlow: StateFlow<Trigger> = triggerMutableStateFlow.asStateFlow()
+  private val triggerFlow: Flow<Trigger> = merge(
+    triggerStateFlow,
+    flow {
+      emit(
+        Trigger(
+          roomDatabase.msgDao().getMessagesByIDs(
+            listOf(messageEntityId)
+          ).firstOrNull()
+        )
+      )
+    }
+  )
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  val deleteDraftResultFlow: Flow<Result<Long?>> =
+    triggerFlow.flatMapLatest { trigger ->
+      flow {
+        val messageEntity = trigger.messageEntity ?: return@flow
+        val context: Context = getApplication()
+
+        try {
+          val accountEntity = getActiveAccountSuspend() ?: error("No active account")
+          emit(
+            Result.loading(
+              progressMsg = context.getString(R.string.processing),
+              progress = (-1).toDouble()
+            )
+          )
+
+          GmailApiHelper.deleteMsgsPermanently(
+            context = getApplication(),
+            accountEntity = accountEntity,
+            ids = listOf(messageEntity.uidAsHEX)
+          )
+
+          if (messageEntity.threadId != null) {
+            val threadMessageEntity = roomDatabase.msgDao().getThreadMessageEntity(
+              account = messageEntity.account,
+              folder = messageEntity.folder,
+              threadId = messageEntity.threadId
+            )
+
+            if (threadMessageEntity != null) {
+              val gmailThreadInfo = GmailApiHelper.loadGmailThreadInfoInParallel(
+                context = context,
+                accountEntity = accountEntity,
+                threads = listOf(Thread().apply { id = messageEntity.threadIdAsHEX }),
+                format = GmailApiHelper.RESPONSE_FORMAT_FULL
+              ).firstOrNull()
+
+              if (gmailThreadInfo != null) {
+                val updateCandidate = MessageEntity.genMessageEntities(
+                  context = context,
+                  account = accountEntity.email,
+                  accountType = accountEntity.accountType,
+                  label = threadMessageEntity.folder,
+                  msgsList = listOf(gmailThreadInfo.lastMessage),
+                  isNew = false,
+                  onlyPgpModeEnabled = accountEntity.showOnlyEncrypted ?: false
+                ) { _, entity ->
+                  entity.copy(
+                    id = threadMessageEntity.id,
+                    uid = threadMessageEntity.uid,
+                    subject = gmailThreadInfo.subject,
+                    threadMessagesCount = gmailThreadInfo.messagesCount,
+                    threadDraftsCount = gmailThreadInfo.draftsCount,
+                    labelIds = gmailThreadInfo.labels.joinToString(separator = LABEL_IDS_SEPARATOR),
+                    hasAttachments = gmailThreadInfo.hasAttachments,
+                    fromAddresses = InternetAddress.toString(gmailThreadInfo.recipients.toTypedArray()),
+                    hasPgp = gmailThreadInfo.hasPgpThings,
+                    flags = if (gmailThreadInfo.hasUnreadMessages) {
+                      threadMessageEntity.flags?.replace(MessageFlag.SEEN.value, "")
+                    } else {
+                      if (threadMessageEntity.flags?.contains(MessageFlag.SEEN.value) == true) {
+                        threadMessageEntity.flags
+                      } else {
+                        threadMessageEntity.flags.plus("${MessageFlag.SEEN.value} ")
+                      }
+                    }
+                  )
+                }
+
+                roomDatabase.msgDao().updateSuspend(updateCandidate)
+              }
+            }
+          }
+
+          emit(Result.success(messageEntityId))
+        } catch (e: Exception) {
+          e.printStackTraceIfDebugOnly()
+          emit(Result.exception(e))
+        }
+      }
+    }
+
+  fun retry() {
+    viewModelScope.launch {
+      val messageEntity = roomDatabase.msgDao().getMessagesByIDs(
+        listOf(messageEntityId)
+      ).firstOrNull()
+      triggerMutableStateFlow.value = Trigger(messageEntity)
+    }
+  }
+
+  data class Trigger(
+    val messageEntity: MessageEntity? = null,
+    val id: Long = System.currentTimeMillis()
+  )
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DownloadAttachmentViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DownloadAttachmentViewModel.kt
index b6a3fa2664..ac758fb18d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DownloadAttachmentViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DownloadAttachmentViewModel.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.viewmodel
@@ -19,7 +19,6 @@ import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.security.SecurityUtils
 import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
 import com.flowcrypt.email.util.exception.ExceptionUtil
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Folder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -29,9 +28,9 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.apache.commons.io.IOUtils
+import org.eclipse.angus.mail.imap.IMAPFolder
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
-import java.lang.IllegalArgumentException
 
 /**
  * @author Denys Bondarenko
@@ -99,7 +98,7 @@ class DownloadAttachmentViewModel(val attachmentInfo: AttachmentInfo, applicatio
       context = context,
       accountEntity = account,
       msgId = attachmentInfo.uid.toHex(),
-      format = GmailApiHelper.MESSAGE_RESPONSE_FORMAT_FULL
+      format = GmailApiHelper.RESPONSE_FORMAT_FULL
     )
     val attPart = GmailApiHelper.getAttPartByPath(msg.payload, neededPath = attachmentInfo.path)
       ?: throw IllegalStateException(context.getString(R.string.attachment_not_found))
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DraftViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DraftViewModel.kt
index 24853ea7f9..0fc5d28cbc 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DraftViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/DraftViewModel.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.viewmodel
@@ -57,7 +57,7 @@ import java.util.concurrent.TimeUnit
  */
 class DraftViewModel(
   existingDraftMessageEntity: MessageEntity? = null,
-  private val gmailThreadId: String? = null,
+  private val gmailThreadId: Long? = null,
   application: Application
 ) : AccountViewModel(application) {
   private var sessionDraftMessageEntity: MessageEntity? = existingDraftMessageEntity
@@ -77,6 +77,10 @@ class DraftViewModel(
   val savingDraftStateFlow: StateFlow<Result<Boolean>> =
     savingDraftMutableStateFlow.asStateFlow()
 
+  fun getSessionDraftMessageEntity(): MessageEntity? {
+    return sessionDraftMessageEntity?.copy()
+  }
+
   fun processDraft(
     coroutineScope: CoroutineScope = viewModelScope,
     currentOutgoingMessageInfo: OutgoingMessageInfo,
@@ -97,7 +101,7 @@ class DraftViewModel(
       if (isSavingDraftNeeded) {
         if (showNotification) {
           withContext(Dispatchers.Main) {
-            context.toast(context.getString(R.string.draft_saved))
+            context.toast(context.getString(R.string.saving_draft))
           }
         }
         withContext(Dispatchers.IO) {
@@ -115,7 +119,7 @@ class DraftViewModel(
         }
       } else if (showNotification && timeToCompare < draftFingerprint.timeInMilliseconds) {
         withContext(Dispatchers.Main) {
-          context.toast(context.getString(R.string.draft_saved))
+          context.toast(context.getString(R.string.saving_draft))
         }
       }
     }
@@ -123,7 +127,8 @@ class DraftViewModel(
 
   fun setupWithInitializationData(
     initializationData: InitializationData,
-    timeInMilliseconds: Long
+    timeInMilliseconds: Long,
+    skipCheckingSignature: Boolean
   ) {
     draftFingerprint = DraftFingerprint(
       msgText = initializationData.body ?: "",
@@ -131,7 +136,8 @@ class DraftViewModel(
       toRecipients = initializationData.toAddresses.map { it.lowercase() }.toSet(),
       ccRecipients = initializationData.ccAddresses.map { it.lowercase() }.toSet(),
       bccRecipients = initializationData.bccAddresses.map { it.lowercase() }.toSet(),
-      timeInMilliseconds = timeInMilliseconds
+      timeInMilliseconds = timeInMilliseconds,
+      skipCheckingSignature = skipCheckingSignature
     )
   }
 
@@ -148,7 +154,8 @@ class DraftViewModel(
         internetAddress.address.lowercase()
       }?.toSet() ?: emptySet()
 
-    val isTextTheSame = if (outgoingMessageInfo.signature != null) {
+    val isTextTheSame =
+      if (outgoingMessageInfo.signature != null && !draftFingerprint.skipCheckingSignature) {
       val textWithoutSignature = outgoingMessageInfo.msg?.replaceFirst(
         regex = ("\n\n" + outgoingMessageInfo.signature).toRegex(RegexOption.MULTILINE),
         replacement = ""
@@ -254,10 +261,10 @@ class DraftViewModel(
           )
           val messageEntityWithoutStateChange = draftMessageEntity.copy(
             subject = outgoingMessageInfo.subject,
-            fromAddress = InternetAddress.toString(arrayOf(outgoingMessageInfo.from)),
-            replyTo = InternetAddress.toString(arrayOf(outgoingMessageInfo.from)),
-            toAddress = InternetAddress.toString(outgoingMessageInfo.toRecipients?.toTypedArray()),
-            ccAddress = InternetAddress.toString(outgoingMessageInfo.ccRecipients?.toTypedArray()),
+            fromAddresses = InternetAddress.toString(arrayOf(outgoingMessageInfo.from)),
+            replyToAddresses = InternetAddress.toString(arrayOf(outgoingMessageInfo.from)),
+            toAddresses = InternetAddress.toString(outgoingMessageInfo.toRecipients?.toTypedArray()),
+            ccAddresses = InternetAddress.toString(outgoingMessageInfo.ccRecipients?.toTypedArray()),
             sentDate = mimeMessage.sentDate?.time,
             receivedDate = mimeMessage.sentDate?.time
           )
@@ -286,15 +293,17 @@ class DraftViewModel(
       val folderDrafts =
         foldersManager.folderDrafts ?: throw IllegalStateException("Drafts folder is undefined")
       val newDraftMessageEntity = MessageEntity.genMsgEntity(
-        email = accountEntity.email,
+        account = accountEntity.email,
+        accountType = accountEntity.accountType,
         label = folderDrafts.fullName,
-        uid = System.currentTimeMillis(),
+        uid = outgoingMessageInfo.uid,
         info = outgoingMessageInfo,
         flags = listOf(MessageFlag.DRAFT, MessageFlag.SEEN)
       ).copy(
         state = MessageState.PENDING_UPLOADING_DRAFT.value,
         threadId = gmailThreadId,
-        labelIds = GmailApiHelper.LABEL_DRAFT
+        labelIds = GmailApiHelper.LABEL_DRAFT,
+        isVisible = false
       )
       val id = roomDatabase.msgDao().insertSuspend(newDraftMessageEntity)
       return@withContext newDraftMessageEntity.copy(
@@ -311,6 +320,14 @@ class DraftViewModel(
           draftEntity.copy(state = MessageState.PENDING_DELETING_DRAFT.value)
         )
 
+        val draftsDir = CacheManager.getDraftDirectory(getApplication())
+
+        draftsDir.walkTopDown().firstOrNull {
+          it.name == draftEntity.id.toString()
+        }?.let { currentMsgDraftDir ->
+          FileAndDirectoryUtils.deleteDir(currentMsgDraftDir)
+        }
+
         DeleteDraftsWorker.enqueue(getApplication())
       }
     }
@@ -322,7 +339,8 @@ class DraftViewModel(
     val toRecipients: Set<String> = setOf(),
     val ccRecipients: Set<String> = setOf(),
     val bccRecipients: Set<String> = setOf(),
-    val timeInMilliseconds: Long = System.currentTimeMillis()
+    val timeInMilliseconds: Long = System.currentTimeMillis(),
+    val skipCheckingSignature: Boolean = false,
   )
 
   companion object {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/GmailLabelsViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/GmailLabelsViewModel.kt
index 121e03effc..9b85a4232a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/GmailLabelsViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/GmailLabelsViewModel.kt
@@ -118,13 +118,23 @@ class GmailLabelsViewModel(
             it.initialState != MaterialCheckBox.STATE_UNCHECKED && it.state == MaterialCheckBox.STATE_UNCHECKED
           }
 
-          GmailApiHelper.changeLabels(
-            context = getApplication(),
-            accountEntity = activeAccount,
-            ids = messageEntities.map { it.uidAsHEX },
-            addLabelIds = labelsToBeAdded.map { it.id },
-            removeLabelIds = labelsToBeRemoved.map { it.id }
-          )
+          if (activeAccount.useConversationMode) {
+            GmailApiHelper.changeLabelsForThreads(
+              context = getApplication(),
+              accountEntity = activeAccount,
+              threadIdList = messageEntities.mapNotNull { it.threadIdAsHEX }.toSet(),
+              addLabelIds = labelsToBeAdded.map { it.id },
+              removeLabelIds = labelsToBeRemoved.map { it.id }
+            )
+          } else {
+            GmailApiHelper.changeLabels(
+              context = getApplication(),
+              accountEntity = activeAccount,
+              ids = messageEntities.map { it.uidAsHEX },
+              addLabelIds = labelsToBeAdded.map { it.id },
+              removeLabelIds = labelsToBeRemoved.map { it.id }
+            )
+          }
 
           //update labels in the local cache
           val toBeDeletedMessageEntities = mutableListOf<MessageEntity>()
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/LabelsViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/LabelsViewModel.kt
index 6fa9053539..75d301fc83 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/LabelsViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/LabelsViewModel.kt
@@ -17,7 +17,6 @@ import com.flowcrypt.email.api.email.IMAPStoreManager
 import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.api.retrofit.response.base.Result
-import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.LabelEntity
 import com.flowcrypt.email.jetpack.workmanager.sync.UpdateLabelsWorker
 import kotlinx.coroutines.launch
@@ -32,11 +31,9 @@ class LabelsViewModel(application: Application) : AccountViewModel(application)
 
   val foldersManagerLiveData: LiveData<FoldersManager> = labelsLiveData.switchMap {
     liveData {
-      val foldersManager = activeAccountLiveData.value?.let { account ->
-        FoldersManager.build(account, it)
-      } ?: FoldersManager(AccountEntity(""))
-
-      emit(foldersManager)
+      activeAccountLiveData.value?.let { account ->
+        emit(FoldersManager.build(account, it))
+      }
     }
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt
index dbd1636b59..5053007c6e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.viewmodel
@@ -22,7 +22,9 @@ import com.flowcrypt.email.api.email.FoldersManager
 import com.flowcrypt.email.api.email.IMAPStoreManager
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.api.email.gmail.GmailApiHelper
+import com.flowcrypt.email.api.email.gmail.GmailHistoryHandler
 import com.flowcrypt.email.api.email.gmail.api.GmaiAPIMimeMessage
+import com.flowcrypt.email.api.email.gmail.model.GmailThreadInfo
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.api.email.model.MessageFlag
 import com.flowcrypt.email.api.retrofit.response.base.Result
@@ -32,9 +34,10 @@ import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.AttachmentEntity
 import com.flowcrypt.email.database.entity.LabelEntity
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.hasPgp
+import com.flowcrypt.email.database.entity.MessageEntity.Companion.LABEL_IDS_SEPARATOR
+import com.flowcrypt.email.extensions.isAppForegrounded
+import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
 import com.flowcrypt.email.extensions.kotlin.toHex
-import com.flowcrypt.email.jetpack.workmanager.EmailAndNameWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.SyncDraftsWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.UploadDraftsWorker
 import com.flowcrypt.email.service.MessagesNotificationManager
@@ -44,13 +47,11 @@ import com.flowcrypt.email.util.OutgoingMessagesManager
 import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
 import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.google.api.client.googleapis.json.GoogleJsonResponseException
-import com.google.api.services.gmail.model.History
 import com.google.api.services.gmail.model.ListDraftsResponse
 import com.google.api.services.gmail.model.ListMessagesResponse
 import jakarta.mail.FetchProfile
 import jakarta.mail.Folder
 import jakarta.mail.Message
-import jakarta.mail.MessagingException
 import jakarta.mail.Session
 import jakarta.mail.Store
 import jakarta.mail.UIDFolder
@@ -187,10 +188,18 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
           } else {
             IMAPStoreManager.getConnection(accountEntity.id)?.executeWithResult { store ->
               refreshMsgsInternal(accountEntity, store, localFolder)
-            }
-              ?: Result.exception(NullPointerException("There is no active connection for ${accountEntity.email}"))
+            } ?: Result.exception(
+              NullPointerException(
+                "There is no active connection for ${accountEntity.email}"
+              )
+            )
           }
         }
+
+        if (localFolder.isDrafts) {
+          SyncDraftsWorker.enqueue(getApplication())
+          UploadDraftsWorker.enqueue(getApplication())
+        }
       }
     }
   }
@@ -265,7 +274,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
       var needUpdateOutboxLabel = false
       for (entity in entities) {
         val isMsgDeleted = with(entity) {
-          roomDatabase.msgDao().deleteOutgoingMsg(email, folder, uid) > 0
+          roomDatabase.msgDao().deleteOutgoingMsg(account, folder, uid) > 0
         }
 
         if (isMsgDeleted) {
@@ -417,7 +426,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
         )
       )
       if (end < 1) {
-        handleReceivedMsgs(accountEntity, localFolder, imapFolder)
+        handleReceivedMessages(accountEntity, localFolder, imapFolder)
       } else {
         val msgs: Array<Message> = if (isOnlyPgpModeEnabled == true) {
           foundMsgs.copyOfRange(start - 1, end)
@@ -433,7 +442,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
           imapFolder.search(EmailUtil.genPgpThingsSearchTerm(accountEntity), msgs)
             .map { imapFolder.getUID(it) }.toSet()
 
-        handleReceivedMsgs(
+        handleReceivedMessages(
           account = accountEntity,
           localFolder = localFolder,
           remoteFolder = folder,
@@ -461,31 +470,58 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
             resultCode = R.id.progress_id_gmail_list
           )
         )
-        val messagesBaseInfo = GmailApiHelper.loadMsgsBaseInfo(
-          context = getApplication(),
-          accountEntity = accountEntity,
-          localFolder = localFolder,
-          nextPageToken = if (totalItemsCount > 0) labelEntity?.nextPageToken else null
-        )
 
-        val draftIdsMap = when (messagesBaseInfo) {
-          is ListDraftsResponse -> messagesBaseInfo.drafts?.associateBy(
-            { it.message.id },
-            { it.id }) ?: emptyMap()
+        val messages: List<com.google.api.services.gmail.model.Message>
+        val nextPageToken: String?
+        val draftIdsMap: Map<String, String>
+        val gmailThreadInfoList: List<GmailThreadInfo>
+
+        if (accountEntity.useConversationMode) {
+          val threadsResponse = GmailApiHelper.loadThreads(
+            context = getApplication(),
+            accountEntity = accountEntity,
+            localFolder = localFolder,
+            nextPageToken = if (totalItemsCount > 0) labelEntity?.nextPageToken else null
+          )
 
-          else -> emptyMap()
-        }
+          gmailThreadInfoList = GmailApiHelper.loadGmailThreadInfoInParallel(
+            context = getApplication(),
+            accountEntity = accountEntity,
+            threads = threadsResponse.threads ?: emptyList(),
+            format = GmailApiHelper.RESPONSE_FORMAT_FULL
+          )
 
-        val messages = when (messagesBaseInfo) {
-          is ListMessagesResponse -> messagesBaseInfo.messages ?: emptyList()
-          is ListDraftsResponse -> messagesBaseInfo.drafts?.map { it.message } ?: emptyList()
-          else -> emptyList()
-        }
+          messages = gmailThreadInfoList.map { it.lastMessage }
+          nextPageToken = threadsResponse.nextPageToken
+          draftIdsMap = emptyMap()
+        } else {
+          gmailThreadInfoList = emptyList()
+          val messagesBaseInfo = GmailApiHelper.loadMsgsBaseInfo(
+            context = getApplication(),
+            accountEntity = accountEntity,
+            localFolder = localFolder,
+            nextPageToken = if (totalItemsCount > 0) labelEntity?.nextPageToken else null
+          )
+
+          draftIdsMap = when (messagesBaseInfo) {
+            is ListDraftsResponse -> messagesBaseInfo.drafts?.associateBy(
+              { it.message.id },
+              { it.id }) ?: emptyMap()
+
+            else -> emptyMap()
+          }
+
+          messages = when (messagesBaseInfo) {
+            is ListMessagesResponse -> messagesBaseInfo.messages ?: emptyList()
+            is ListDraftsResponse -> messagesBaseInfo.drafts?.map { it.message } ?: emptyList()
+            else -> emptyList()
+          }
 
-        val nextPageToken = when (messagesBaseInfo) {
-          is ListMessagesResponse -> messagesBaseInfo.nextPageToken
-          is ListDraftsResponse -> messagesBaseInfo.nextPageToken
-          else -> null
+          nextPageToken = when (messagesBaseInfo) {
+            is ListMessagesResponse -> messagesBaseInfo.nextPageToken
+            is ListDraftsResponse -> messagesBaseInfo.nextPageToken
+            else -> null
+          }
         }
 
         loadMsgsFromRemoteServerLiveData.postValue(
@@ -505,7 +541,38 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
               resultCode = R.id.progress_id_gmail_msgs_info
             )
           )
-          handleReceivedMsgs(accountEntity, localFolder, msgs, draftIdsMap)
+          handleReceivedMessages(
+            accountEntity,
+            localFolder,
+            msgs,
+            draftIdsMap
+          ) { message, messageEntity ->
+            if (accountEntity.useConversationMode) {
+              val thread = gmailThreadInfoList.firstOrNull { it.id == message.threadId }
+              if (thread != null) {
+                messageEntity.copy(
+                  subject = thread.subject,
+                  threadMessagesCount = thread.messagesCount,
+                  threadDraftsCount = thread.draftsCount,
+                  labelIds = thread.labels.joinToString(separator = LABEL_IDS_SEPARATOR),
+                  hasAttachments = thread.hasAttachments,
+                  fromAddresses = InternetAddress.toString(
+                    thread.recipients.toTypedArray()
+                  ),
+                  hasPgp = thread.hasPgpThings,
+                  //we need to identify threads by UID. But we can't have uid == threadId
+                  //as the first message in a thread has such a situation.
+                  //So we will use Long.MAX_VALUE to save 'threadId' modified
+                  //and will be able to recreate it.
+                  uid = Long.MAX_VALUE - (messageEntity.threadId ?: System.nanoTime())
+                )
+              } else {
+                messageEntity
+              }
+            } else {
+              messageEntity
+            }
+          }
         } else {
           loadMsgsFromRemoteServerLiveData.postValue(
             Result.loading(
@@ -523,11 +590,15 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     return@withContext Result.success(true)
   }
 
-  private suspend fun handleReceivedMsgs(
+  private suspend fun handleReceivedMessages(
     account: AccountEntity,
     localFolder: LocalFolder,
     msgs: List<com.google.api.services.gmail.model.Message>,
-    draftIdsMap: Map<String, String> = emptyMap()
+    draftIdsMap: Map<String, String> = emptyMap(),
+    messageEntityModificationAction: (
+      message: com.google.api.services.gmail.model.Message,
+      messageEntity: MessageEntity
+    ) -> MessageEntity
   ) = withContext(Dispatchers.IO) {
     val email = account.email
     val folder = localFolder.fullName
@@ -535,38 +606,41 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     val isOnlyPgpModeEnabled = account.showOnlyEncrypted ?: false
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
-      email = email,
+      account = email,
+      accountType = account.accountType,
       label = folder,
       msgsList = msgs,
       isNew = false,
       onlyPgpModeEnabled = isOnlyPgpModeEnabled,
       draftIdsMap = draftIdsMap
-    )
+    ) { message, messageEntity ->
+      messageEntityModificationAction.invoke(message, messageEntity)
+    }
 
     roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
     GmailApiHelper.identifyAttachments(msgEntities, msgs, account, localFolder, roomDatabase)
     val session = Session.getInstance(Properties())
-    updateLocalContactsIfNeeded(messages = msgs
+    GeneralUtil.updateLocalContactsIfNeeded(
+      context = getApplication(),
+      messages = msgs
       .filter { it.labelIds?.contains(GmailApiHelper.LABEL_SENT) == true }
       .map { GmaiAPIMimeMessage(session, it) }.toTypedArray()
     )
   }
 
-  private suspend fun handleReceivedMsgs(
+  private suspend fun handleReceivedMessages(
     account: AccountEntity,
     localFolder: LocalFolder,
     remoteFolder: IMAPFolder,
     msgs: Array<Message> = emptyArray(),
     hasPgpAfterAdditionalSearchSet: Set<Long> = emptySet()
   ) = withContext(Dispatchers.IO) {
-    val email = account.email
-    val folder = localFolder.fullName
-
     val isOnlyPgpModeEnabled = account.showOnlyEncrypted ?: false
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
-      email = email,
-      label = folder,
+      account = account.email,
+      accountType = account.accountType,
+      label = localFolder.fullName,
       folder = remoteFolder,
       msgs = msgs,
       isNew = false,
@@ -577,7 +651,11 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
 
     identifyAttachments(msgEntities, msgs, remoteFolder, account, localFolder, roomDatabase)
-    updateLocalContactsIfNeeded(remoteFolder, msgs)
+    GeneralUtil.updateLocalContactsIfNeeded(
+      context = getApplication(),
+      imapFolder = remoteFolder,
+      messages = msgs
+    )
   }
 
   private suspend fun identifyAttachments(
@@ -593,11 +671,12 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
           val uid = remoteFolder.getUID(msg)
           attachments.addAll(EmailUtil.getAttsInfoFromPart(msg).mapNotNull { attachmentInfo ->
             AttachmentEntity.fromAttInfo(
-              attachmentInfo.copy(
+              attachmentInfo = attachmentInfo.copy(
                 email = account.email,
                 folder = localFolder.fullName,
                 uid = uid
-              )
+              ),
+              accountType = account.accountType
             )
           })
         }
@@ -610,59 +689,6 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     }
   }
 
-  private suspend fun updateLocalContactsIfNeeded(
-    imapFolder: IMAPFolder? = null,
-    messages: Array<Message>
-  ) = withContext(Dispatchers.IO) {
-    try {
-      val isSentFolder = imapFolder?.attributes?.contains("\\Sent") ?: true
-
-      if (isSentFolder) {
-        val emailAndNamePairs = mutableListOf<Pair<String, String?>>()
-        for (message in messages) {
-          emailAndNamePairs.addAll(getEmailAndNamePairs(message))
-        }
-
-        EmailAndNameWorker.enqueue(getApplication(), emailAndNamePairs)
-      }
-    } catch (e: MessagingException) {
-      e.printStackTrace()
-      ExceptionUtil.handleError(e)
-    }
-  }
-
-  /**
-   * Generate a list of [Pair] objects from the input message.
-   * This information will be retrieved from "to" and "cc" headers.
-   *
-   * @param msg The input [jakarta.mail.Message].
-   * @return <tt>[List]</tt> of [Pair] objects, which contains information
-   * about
-   * emails and names.
-   * @throws MessagingException when retrieve information about recipients.
-   */
-  private fun getEmailAndNamePairs(msg: Message): List<Pair<String, String>> {
-    val pairs = mutableListOf<Pair<String, String>>()
-
-    val addressesTo = msg.getRecipients(Message.RecipientType.TO)
-    if (addressesTo != null) {
-      for (address in addressesTo) {
-        val internetAddress = address as InternetAddress
-        pairs.add(Pair(internetAddress.address, internetAddress.personal))
-      }
-    }
-
-    val addressesCC = msg.getRecipients(Message.RecipientType.CC)
-    if (addressesCC != null) {
-      for (address in addressesCC) {
-        val internetAddress = address as InternetAddress
-        pairs.add(Pair(internetAddress.address, internetAddress.personal))
-      }
-    }
-
-    return pairs
-  }
-
   private suspend fun searchMsgsOnRemoteServerAndStoreLocally(
     accountEntity: AccountEntity,
     localFolder: LocalFolder,
@@ -676,43 +702,107 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
             resultCode = R.id.progress_id_gmail_list
           )
         )
-        val messagesBaseInfo = GmailApiHelper.loadMsgsBaseInfoUsingSearch(
-          getApplication(), accountEntity,
-          localFolder, if (totalItemsCount > 0) searchNextPageToken else null
-        )
-        loadMsgsFromRemoteServerLiveData.postValue(
-          Result.loading(
-            progress = 70.0,
-            resultCode = R.id.progress_id_gmail_msgs_info
+
+        val nextPageToken: String
+        val gmailThreadInfoList: List<GmailThreadInfo>
+        val messages = if (accountEntity.useConversationMode) {
+          val threadsResponse = GmailApiHelper.loadThreads(
+            context = getApplication(),
+            accountEntity = accountEntity,
+            localFolder = localFolder,
+            nextPageToken = if (totalItemsCount > 0) searchNextPageToken else null
           )
-        )
+          nextPageToken = threadsResponse.nextPageToken
 
-        if (messagesBaseInfo.messages?.isNotEmpty() == true) {
-          val msgs = GmailApiHelper.loadMsgsInParallel(
-            getApplication(), accountEntity, messagesBaseInfo.messages
-              ?: emptyList(), localFolder
+          if (threadsResponse.threads.isNullOrEmpty()) {
+            gmailThreadInfoList = emptyList()
+            null
+          } else {
+            gmailThreadInfoList = GmailApiHelper.loadGmailThreadInfoInParallel(
+              context = getApplication(),
+              accountEntity = accountEntity,
+              threads = threadsResponse.threads ?: emptyList(),
+              format = GmailApiHelper.RESPONSE_FORMAT_FULL
+            )
+
+            val messages = gmailThreadInfoList.map { it.lastMessage }
+            val msgs = GmailApiHelper.loadMsgsInParallel(
+              getApplication(), accountEntity, messages, localFolder
+            )
+            loadMsgsFromRemoteServerLiveData.postValue(
+              Result.loading(
+                progress = 90.0,
+                resultCode = R.id.progress_id_gmail_msgs_info
+              )
+            )
+            msgs
+          }
+        } else {
+          gmailThreadInfoList = emptyList()
+          val messagesBaseInfo = GmailApiHelper.loadMsgsBaseInfoUsingSearch(
+            getApplication(), accountEntity,
+            localFolder, if (totalItemsCount > 0) searchNextPageToken else null
           )
+          nextPageToken = messagesBaseInfo.nextPageToken
           loadMsgsFromRemoteServerLiveData.postValue(
             Result.loading(
-              progress = 90.0,
+              progress = 70.0,
               resultCode = R.id.progress_id_gmail_msgs_info
             )
           )
+
+          if (messagesBaseInfo.messages.isNullOrEmpty()) {
+            null
+          } else {
+            GmailApiHelper.loadMsgsInParallel(
+              getApplication(), accountEntity, messagesBaseInfo.messages
+                ?: emptyList(), localFolder
+            )
+          }
+        }
+
+        loadMsgsFromRemoteServerLiveData.postValue(
+          Result.loading(
+            progress = 90.0,
+            resultCode = R.id.progress_id_gmail_msgs_info
+          )
+        )
+
+        if (!messages.isNullOrEmpty()) {
           handleSearchResults(
             accountEntity,
             localFolder.copy(fullName = JavaEmailConstants.FOLDER_SEARCH),
-            msgs
-          )
-        } else {
-          loadMsgsFromRemoteServerLiveData.postValue(
-            Result.loading(
-              progress = 90.0,
-              resultCode = R.id.progress_id_gmail_msgs_info
-            )
-          )
+            messages
+          ) { message, messageEntity ->
+            if (accountEntity.useConversationMode) {
+              val thread = gmailThreadInfoList.firstOrNull { it.id == message.threadId }
+              if (thread != null) {
+                messageEntity.copy(
+                  subject = thread.subject,
+                  threadMessagesCount = thread.messagesCount,
+                  threadDraftsCount = thread.draftsCount,
+                  labelIds = thread.labels.joinToString(separator = LABEL_IDS_SEPARATOR),
+                  hasAttachments = thread.hasAttachments,
+                  fromAddresses = InternetAddress.toString(
+                    thread.recipients.toTypedArray()
+                  ),
+                  hasPgp = thread.hasPgpThings,
+                  //we need to identify threads by UID. But we can't have uid == threadId
+                  //as the first message in a thread has such a situation.
+                  //So we will use Long.MAX_VALUE to save 'threadId' modified
+                  //and will be able to recreate it.
+                  uid = Long.MAX_VALUE - (messageEntity.threadId ?: System.nanoTime())
+                )
+              } else {
+                messageEntity
+              }
+            } else {
+              messageEntity
+            }
+          }
         }
 
-        searchNextPageToken = messagesBaseInfo.nextPageToken
+        searchNextPageToken = nextPageToken
       }
     }
 
@@ -784,49 +874,57 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     msgs: Array<Message> = emptyArray(),
     hasPgpAfterAdditionalSearchSet: Set<Long> = emptySet()
   ) = withContext(Dispatchers.IO) {
-    val email = account.email
-    val isOnlyPgpModeEnabled = account.showOnlyEncrypted ?: false
-    val searchLabel = JavaEmailConstants.FOLDER_SEARCH
-
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
-      email = email,
-      label = searchLabel,
+      account = account.email,
+      accountType = account.accountType,
+      label = JavaEmailConstants.FOLDER_SEARCH,
       folder = remoteFolder,
       msgs = msgs,
       isNew = false,
-      isOnlyPgpModeEnabled = isOnlyPgpModeEnabled,
+      isOnlyPgpModeEnabled = account.showOnlyEncrypted ?: false,
       hasPgpAfterAdditionalSearchSet = hasPgpAfterAdditionalSearchSet
     )
 
     roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
 
-    updateLocalContactsIfNeeded(remoteFolder, msgs)
+    GeneralUtil.updateLocalContactsIfNeeded(
+      context = getApplication(),
+      imapFolder = remoteFolder,
+      messages = msgs
+    )
   }
 
   private suspend fun handleSearchResults(
     account: AccountEntity, localFolder: LocalFolder,
-    msgs: List<com.google.api.services.gmail.model.Message>
+    msgs: List<com.google.api.services.gmail.model.Message>,
+    messageEntityModificationAction: (
+      message: com.google.api.services.gmail.model.Message,
+      messageEntity: MessageEntity
+    ) -> MessageEntity
   ) = withContext(Dispatchers.IO) {
-    val email = account.email
-    val label = localFolder.fullName
-
     val isOnlyPgpModeEnabled = account.showOnlyEncrypted ?: false
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
-      email = email,
-      label = label,
+      account = account.email,
+      accountType = account.accountType,
+      label = localFolder.fullName,
       msgsList = msgs,
       isNew = false,
       onlyPgpModeEnabled = isOnlyPgpModeEnabled
-    )
+    ) { message, messageEntity ->
+      messageEntityModificationAction.invoke(message, messageEntity)
+    }
 
     roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
     GmailApiHelper.identifyAttachments(msgEntities, msgs, account, localFolder, roomDatabase)
     val session = Session.getInstance(Properties())
-    updateLocalContactsIfNeeded(messages = msgs
+    GeneralUtil.updateLocalContactsIfNeeded(
+      context = getApplication(),
+      messages = msgs
       .filter { it.labelIds?.contains(GmailApiHelper.LABEL_SENT) == true }
-      .map { GmaiAPIMimeMessage(session, it) }.toTypedArray()
+        .map { GmaiAPIMimeMessage(session, it) }
+        .toTypedArray()
     )
   }
 
@@ -835,7 +933,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     localFolder: LocalFolder
   ): Result<Boolean?> = withContext(Dispatchers.IO) {
     val newestMsg =
-      roomDatabase.msgDao().getNewestMsg(account = accountEntity.email, localFolder.fullName)
+      roomDatabase.msgDao().getNewestMsgOrThread(accountEntity, localFolder.fullName)
     try {
       val labelEntity = roomDatabase.labelDao()
         .getLabelSuspend(accountEntity.email, accountEntity.accountType, localFolder.fullName)
@@ -849,13 +947,18 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
         historyId = labelEntityHistoryId.max(msgEntityHistoryId)
       )
 
-      handleMsgsFromHistory(accountEntity, localFolder, historyList)
+      GmailHistoryHandler.handleHistory(
+        context = getApplication(),
+        accountEntity = accountEntity,
+        localFolder = localFolder,
+        historyList = historyList
+      )
     } catch (e: Exception) {
-      e.printStackTrace()
+      e.printStackTraceIfDebugOnly()
       when (e) {
         is GoogleJsonResponseException -> {
           if (localFolder.getFolderType() == FoldersManager.FolderType.INBOX
-            && e.statusCode == HttpURLConnection.HTTP_NOT_FOUND
+            && e.details.code == HttpURLConnection.HTTP_NOT_FOUND
             && e.details.errors.any { it.reason.equals("notFound", true) }
           ) {
             //client must perform a full sync
@@ -864,7 +967,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
           }
         }
 
-        else -> throw e
+        else -> return@withContext Result.exception(e)
       }
     }
 
@@ -948,6 +1051,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     hasPgpAfterAdditionalSearchSet: Set<Long>,
     updatedMsgs: Array<Message>
   ) = withContext(Dispatchers.IO) {
+    val context: Context = getApplication()
     val email = accountEntity.email
     val folderName = localFolder.fullName
 
@@ -958,7 +1062,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     roomDatabase.msgDao().deleteByUIDsSuspend(accountEntity.email, folderName, deleteCandidatesUIDs)
 
     val folderType = FoldersManager.getFolderType(localFolder)
-    if (!GeneralUtil.isAppForegrounded() && folderType === FoldersManager.FolderType.INBOX) {
+    if (!context.isAppForegrounded() && folderType === FoldersManager.FolderType.INBOX) {
       val notificationManager = MessagesNotificationManager(getApplication())
       for (uid in deleteCandidatesUIDs) {
         notificationManager.cancel(uid.toHex())
@@ -968,11 +1072,12 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     val newCandidates = EmailUtil.genNewCandidates(msgsUIDs, remoteFolder, newMsgs)
 
     val isOnlyPgpModeEnabled = accountEntity.showOnlyEncrypted ?: false
-    val isNew = !GeneralUtil.isAppForegrounded() && folderType === FoldersManager.FolderType.INBOX
+    val isNew = !context.isAppForegrounded() && folderType === FoldersManager.FolderType.INBOX
 
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
-      email = email,
+      account = email,
+      accountType = accountEntity.accountType,
       label = folderName,
       folder = remoteFolder,
       msgs = newCandidates,
@@ -988,89 +1093,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
         .associate { remoteFolder.getUID(it) to it.flags }
     roomDatabase.msgDao().updateFlagsSuspend(accountEntity.email, folderName, updateCandidates)
 
-    updateLocalContactsIfNeeded(remoteFolder, newCandidates)
-  }
-
-  private suspend fun handleMsgsFromHistory(
-    accountEntity: AccountEntity, localFolder: LocalFolder,
-    historyList: List<History>
-  ) = withContext(Dispatchers.IO) {
-
-    GmailApiHelper.processHistory(localFolder, historyList) { deleteCandidatesUIDs,
-                                                              newCandidatesMap,
-                                                              updateCandidatesMap,
-                                                              labelsToBeUpdatedMap ->
-      roomDatabase.msgDao()
-        .deleteByUIDsSuspend(accountEntity.email, localFolder.fullName, deleteCandidatesUIDs)
-
-      val folderType = FoldersManager.getFolderType(localFolder)
-      if (folderType === FoldersManager.FolderType.INBOX) {
-        val notificationManager = MessagesNotificationManager(getApplication())
-        for (uid in deleteCandidatesUIDs) {
-          notificationManager.cancel(uid.toHex())
-        }
-      }
-
-      val newCandidates = newCandidatesMap.values
-      if (newCandidates.isNotEmpty()) {
-        val msgs = GmailApiHelper.loadMsgsInParallel(
-          getApplication(), accountEntity,
-          newCandidates.toList(), localFolder
-        ).run {
-          if (accountEntity.showOnlyEncrypted == true) {
-            filter { it.hasPgp() }
-          } else this
-        }
-
-        val draftIdsMap = if (localFolder.isDrafts) {
-          val drafts =
-            GmailApiHelper.loadBaseDraftInfoInParallel(getApplication(), accountEntity, msgs)
-          val fetchedDraftIdsMap = drafts.associateBy({ it.message.id }, { it.id })
-          if (fetchedDraftIdsMap.size != msgs.size) {
-            throw IllegalStateException(
-              (getApplication() as Context).getString(R.string.fetching_drafts_info_failed)
-            )
-          }
-          fetchedDraftIdsMap
-        } else emptyMap()
-
-        val isNew =
-          !GeneralUtil.isAppForegrounded() && folderType === FoldersManager.FolderType.INBOX
-
-        val msgEntities = MessageEntity.genMessageEntities(
-          context = getApplication(),
-          email = accountEntity.email,
-          label = localFolder.fullName,
-          msgsList = msgs,
-          isNew = isNew,
-          onlyPgpModeEnabled = accountEntity.showOnlyEncrypted ?: false,
-          draftIdsMap = draftIdsMap
-        )
-
-        roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
-        GmailApiHelper.identifyAttachments(
-          msgEntities,
-          msgs,
-          accountEntity,
-          localFolder,
-          roomDatabase
-        )
-      }
-
-      roomDatabase.msgDao()
-        .updateFlagsSuspend(accountEntity.email, localFolder.fullName, updateCandidatesMap)
-
-      roomDatabase.msgDao()
-        .updateGmailLabels(accountEntity.email, localFolder.fullName, labelsToBeUpdatedMap)
-
-      if (folderType === FoldersManager.FolderType.SENT) {
-        val session = Session.getInstance(Properties())
-        updateLocalContactsIfNeeded(messages = newCandidates
-          .filter { it.labelIds?.contains(GmailApiHelper.LABEL_SENT) == true }
-          .map { GmaiAPIMimeMessage(session, it) }.toTypedArray()
-        )
-      }
-    }
+    GeneralUtil.updateLocalContactsIfNeeded(getApplication(), remoteFolder, newCandidates)
   }
 
   private suspend fun clearHistoryIdForLabel(accountEntity: AccountEntity, label: String) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewPagerViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewPagerViewModel.kt
index f1a16a505e..a4cc57b444 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewPagerViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewPagerViewModel.kt
@@ -23,6 +23,7 @@ class MessagesViewPagerViewModel(
   private val localFolder: LocalFolder,
   application: Application
 ) : AccountViewModel(application) {
+
   val initialLiveData: LiveData<Result<List<MessageEntity>>> =
     activeAccountLiveData.switchMap { accountEntity ->
       liveData {
@@ -61,14 +62,14 @@ class MessagesViewPagerViewModel(
             Result.success(
               roomDatabase.msgDao()
                 .getMessagesForViewPager(
-                  activeAccount.email,
-                  if (localFolder.searchQuery.isNullOrEmpty()) {
+                  account = activeAccount.email,
+                  folder = if (localFolder.searchQuery.isNullOrEmpty()) {
                     localFolder.fullName
                   } else {
                     JavaEmailConstants.FOLDER_SEARCH
                   },
-                  messageEntity.receivedDate ?: 0,
-                  PAGE_SIZE / 2
+                  date = messageEntity.receivedDate ?: 0,
+                  limit = PAGE_SIZE / 2
                 )
             )
           )
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt
index 4e7c140289..2881e44a88 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.viewmodel
@@ -42,10 +42,14 @@ import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.AttachmentEntity
 import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.extensions.com.flowcrypt.email.util.processing
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.getAttachmentInfoList
 import com.flowcrypt.email.extensions.jakarta.mail.isOpenPGPMimeSigned
+import com.flowcrypt.email.extensions.kotlin.processing
 import com.flowcrypt.email.extensions.uid
 import com.flowcrypt.email.jetpack.livedata.SkipInitialValueObserver
 import com.flowcrypt.email.jetpack.workmanager.sync.UpdateMsgsSeenStateWorker
+import com.flowcrypt.email.model.MessageAction
 import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.security.KeysStorageImpl
 import com.flowcrypt.email.security.pgp.PgpDecryptAndOrVerify
@@ -57,9 +61,6 @@ import com.flowcrypt.email.util.cache.DiskLruCache
 import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
 import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.flowcrypt.email.util.exception.SyncTaskTerminatedException
-import org.eclipse.angus.mail.imap.IMAPBodyPart
-import org.eclipse.angus.mail.imap.IMAPFolder
-import org.eclipse.angus.mail.imap.IMAPMessage
 import jakarta.mail.BodyPart
 import jakarta.mail.FetchProfile
 import jakarta.mail.Folder
@@ -82,9 +83,9 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.pgpainless.PGPainless
-import org.pgpainless.key.protection.PasswordBasedSecretKeyRingProtector
-import org.pgpainless.util.Passphrase
+import org.eclipse.angus.mail.imap.IMAPBodyPart
+import org.eclipse.angus.mail.imap.IMAPFolder
+import org.eclipse.angus.mail.imap.IMAPMessage
 import java.io.BufferedInputStream
 import java.io.InputStream
 import java.util.Collections
@@ -125,7 +126,7 @@ class MsgDetailsViewModel(
         if (it.isNotEmpty()) {
           emit(
             roomDatabase.msgDao().getMsgSuspend(
-              account = messageEntity.email,
+              account = messageEntity.account,
               folder = messageEntity.folder,
               uid = messageEntity.uid
             )
@@ -139,7 +140,7 @@ class MsgDetailsViewModel(
       liveData {
         emit(
           roomDatabase.msgDao().getMsgSuspend(
-            account = messageEntity.email,
+            account = messageEntity.account,
             folder = messageEntity.folder,
             uid = messageEntity.uid
           )
@@ -159,8 +160,11 @@ class MsgDetailsViewModel(
           val byteArray = OutgoingMessagesManager.getOutgoingMessageFromFile(
             application,
             requireNotNull(messageEntity.id)
-          )
-          val processingResult = processingByteArray(byteArray)
+          ) ?: byteArrayOf()
+          passphraseNeededLiveData.postValue(emptyList())
+          val processingResult = byteArray.processing(context = getApplication()) { blocks ->
+            preResultsProcessing(blocks)
+          }
           emit(Result.loading(resultCode = R.id.progress_id_processing, progress = 90.toDouble()))
           emit(processingResult)
         }
@@ -278,7 +282,8 @@ class MsgDetailsViewModel(
 
   @OptIn(ExperimentalCoroutinesApi::class)
   private val separatedAttachmentsFlow = roomDatabase.attachmentDao().getAttachmentsFlow(
-    account = messageEntity.email,
+    account = messageEntity.account,
+    accountType = messageEntity.accountType,
     label = messageEntity.folder,
     uid = messageEntity.uid
   ).mapLatest { list ->
@@ -326,15 +331,14 @@ class MsgDetailsViewModel(
           val cachedLabelIds =
             freshestMessageEntity?.labelIds?.split(MessageEntity.LABEL_IDS_SEPARATOR)
           try {
-            val message = GmailApiHelper.loadMsgInfoSuspend(
+            val latestLabelIds = GmailApiHelper.loadMsgInfoSuspend(
               context = getApplication(),
               accountEntity = account,
               msgId = messageEntity.uidAsHEX,
               fields = null,
-              format = GmailApiHelper.MESSAGE_RESPONSE_FORMAT_MINIMAL
-            )
+              format = GmailApiHelper.RESPONSE_FORMAT_MINIMAL
+            ).labelIds
 
-            val latestLabelIds = message.labelIds
             if (cachedLabelIds == null
               || !(latestLabelIds.containsAll(cachedLabelIds)
                   && cachedLabelIds.containsAll(latestLabelIds))
@@ -371,7 +375,7 @@ class MsgDetailsViewModel(
             folderType in setOf(FoldersManager.FolderType.JUNK, FoldersManager.FolderType.SPAM)
         } else {
           this[MessageAction.MOVE_TO_INBOX] = folderType !in listOf(
-            FoldersManager.FolderType.TRASH,
+            FoldersManager.FolderType.INBOX,
             FoldersManager.FolderType.DRAFTS,
             FoldersManager.FolderType.OUTBOX,
           )
@@ -486,7 +490,7 @@ class MsgDetailsViewModel(
         val accountEntity = getActiveAccountSuspend() ?: return@launch
 
         if (JavaEmailConstants.FOLDER_OUTBOX.equals(localFolder.fullName, ignoreCase = true)) {
-          val outgoingMsgCount = roomDatabase.msgDao().getOutboxMsgsSuspend(msgEntity.email).size
+          val outgoingMsgCount = roomDatabase.msgDao().getOutboxMsgsSuspend(msgEntity.account).size
           val outboxLabel = roomDatabase.labelDao().getLabelSuspend(
             account = accountEntity.email,
             accountType = accountEntity.accountType,
@@ -545,57 +549,14 @@ class MsgDetailsViewModel(
 
   private suspend fun processingMsgSnapshot(msgSnapshot: DiskLruCache.Snapshot):
       Result<PgpMsg.ProcessedMimeMessageResult?> = withContext(Dispatchers.IO) {
-    val uri = msgSnapshot.getUri(0)
     passphraseNeededLiveData.postValue(emptyList())
     val accountEntity = getActiveAccountSuspend()
       ?: throw java.lang.NullPointerException("Account is null")
-    if (uri != null) {
-      val context: Context = getApplication()
-      try {
-        val inputStream =
-          context.contentResolver.openInputStream(uri) ?: throw java.lang.IllegalStateException()
-
-        val keys = PGPainless.readKeyRing()
-          .secretKeyRingCollection(accountEntity.servicePgpPrivateKey)
-
-        val decryptionStream = PgpDecryptAndOrVerify.genDecryptionStream(
-          srcInputStream = inputStream,
-          secretKeys = keys,
-          protector = PasswordBasedSecretKeyRingProtector.forKey(
-            keys.first(),
-            Passphrase.fromPassword(accountEntity.servicePgpPassphrase)
-          )
-        )
-
-        val processedMimeMessage = PgpMsg.processMimeMessage(
-          context = getApplication(),
-          inputStream = decryptionStream
-        )
-
-        preResultsProcessing(processedMimeMessage.blocks)
-        return@withContext Result.success(processedMimeMessage)
-      } catch (e: Exception) {
-        return@withContext Result.exception(e)
-      }
-    } else {
-      val byteArray = msgSnapshot.getByteArray(0)
-      return@withContext processingByteArray(byteArray)
-    }
-  }
-
-  private suspend fun processingByteArray(rawMimeBytes: ByteArray?):
-      Result<PgpMsg.ProcessedMimeMessageResult?> = withContext(Dispatchers.IO) {
-    return@withContext if (rawMimeBytes == null) {
-      Result.exception(throwable = IllegalArgumentException("empty byte array"))
-    } else {
-      try {
-        val processedMimeMessageResult =
-          PgpMsg.processMimeMessage(getApplication(), rawMimeBytes.inputStream())
-        preResultsProcessing(processedMimeMessageResult.blocks)
-        return@withContext Result.success(processedMimeMessageResult)
-      } catch (e: Exception) {
-        return@withContext Result.exception(throwable = e)
-      }
+    return@withContext msgSnapshot.processing(
+      context = getApplication(),
+      accountEntity = accountEntity
+    ) { blocks ->
+      preResultsProcessing(blocks)
     }
   }
 
@@ -644,7 +605,7 @@ class MsgDetailsViewModel(
               accountEntity = accountEntity,
               msgId = messageEntity.uidAsHEX,
               fields = null,
-              format = GmailApiHelper.MESSAGE_RESPONSE_FORMAT_FULL
+              format = GmailApiHelper.RESPONSE_FORMAT_FULL
             )
             msgSize = msgFullInfo.sizeEstimate
             val originalMsg = GmaiAPIMimeMessage(
@@ -663,7 +624,7 @@ class MsgDetailsViewModel(
                 GmailApiHelper.getWholeMimeMessageInputStream(
                   context = getApplication(),
                   account = accountEntity,
-                  messageEntity = messageEntity
+                  messageId = msgFullInfo.id
                 )
               )
               MsgsCacheManager.storeMsg(
@@ -911,7 +872,8 @@ class MsgDetailsViewModel(
                   JavaEmailConstants.FOLDER_SEARCH
                 },
                 uid = msgUid
-              )
+              ),
+              accountType = accountEntity.accountType
             )
           }
 
@@ -930,16 +892,16 @@ class MsgDetailsViewModel(
           context = getApplication(),
           accountEntity = accountEntity,
           msgId = messageEntity.uidAsHEX,
-          format = GmailApiHelper.MESSAGE_RESPONSE_FORMAT_FULL
+          format = GmailApiHelper.RESPONSE_FORMAT_FULL
         )
-        val attachments =
-          GmailApiHelper.getAttsInfoFromMessagePart(msg.payload).mapNotNull { attachmentInfo ->
+        val attachments = msg.payload.getAttachmentInfoList().mapNotNull { attachmentInfo ->
             AttachmentEntity.fromAttInfo(
-              attachmentInfo.copy(
+              attachmentInfo = attachmentInfo.copy(
                 email = accountEntity.email,
                 folder = localFolder.fullName,
                 uid = msg.uid
-              )
+              ),
+              accountType = accountEntity.accountType
             )
           }
         FlowCryptRoomDatabase.getDatabase(getApplication()).attachmentDao()
@@ -949,15 +911,6 @@ class MsgDetailsViewModel(
       }
     }
 
-  enum class MessageAction {
-    DELETE,
-    ARCHIVE,
-    MOVE_TO_INBOX,
-    MOVE_TO_SPAM,
-    MARK_AS_NOT_SPAM,
-    CHANGE_LABELS
-  }
-
   /**
    * This class will be used to identify the fetching progress.
    */
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ProcessMessageViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ProcessMessageViewModel.kt
new file mode 100644
index 0000000000..757171958c
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ProcessMessageViewModel.kt
@@ -0,0 +1,382 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.jetpack.viewmodel
+
+import android.app.Application
+import android.content.Context
+import androidx.lifecycle.viewModelScope
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.JavaEmailConstants
+import com.flowcrypt.email.api.email.MsgsCacheManager
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper
+import com.flowcrypt.email.api.email.gmail.api.GmaiAPIMimeMessage
+import com.flowcrypt.email.api.email.model.AttachmentInfo
+import com.flowcrypt.email.api.email.model.IncomingMessageInfo
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.api.email.model.MessageFlag
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.api.retrofit.response.model.AttMsgBlock
+import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
+import com.flowcrypt.email.api.retrofit.response.model.PublicKeyMsgBlock
+import com.flowcrypt.email.database.MessageState
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.extensions.com.flowcrypt.email.util.processing
+import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
+import com.flowcrypt.email.jetpack.workmanager.sync.UpdateMsgsSeenStateWorker
+import com.flowcrypt.email.model.MessageEncryptionType
+import com.flowcrypt.email.security.pgp.PgpKey
+import com.flowcrypt.email.security.pgp.PgpMsg
+import com.flowcrypt.email.ui.adapter.MessagesInThreadListAdapter
+import com.flowcrypt.email.util.cache.DiskLruCache
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * @author Denys Bondarenko
+ */
+class ProcessMessageViewModel(
+  private val message: MessagesInThreadListAdapter.Message,
+  private val skipAttachmentsRawData: Boolean,
+  application: Application
+) : AccountViewModel(application) {
+  private val triggerMutableStateFlow: MutableStateFlow<Trigger> = MutableStateFlow(Trigger())
+  private val triggerStateFlow: StateFlow<Trigger> = triggerMutableStateFlow.asStateFlow()
+  private val triggerFlow: Flow<Trigger> = merge(
+    triggerStateFlow,
+    flow {
+      emit(
+        Trigger(
+          roomDatabase.msgDao().getMessagesByIDs(
+            listOf(requireNotNull(message.messageEntity.id))
+          ).firstOrNull()
+        )
+      )
+    }
+  )
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  private val processedMimeMessageResultFlow: Flow<Result<PgpMsg.ProcessedMimeMessageResult?>> =
+    triggerFlow.flatMapLatest { trigger ->
+      flow {
+        val messageEntity = trigger.messageEntity ?: return@flow
+        val context: Context = getApplication()
+
+        try {
+          if (!messageEntity.isOutboxMsg) {
+            emit(
+              Result.loading(
+                progressMsg = context.getString(R.string.processing),
+                progress = (-1).toDouble()
+              )
+            )
+
+            val existingMsgSnapshot = MsgsCacheManager.getMsgSnapshot(messageEntity.id.toString())
+            if (existingMsgSnapshot != null) {
+              emit(
+                Result.loading(
+                  progressMsg = context.getString(R.string.processing),
+                  resultCode = R.id.progress_id_processing,
+                  progress = 70.toDouble()
+                )
+              )
+              UpdateMsgsSeenStateWorker.enqueue(application)
+              val processingResult = processingMsgSnapshot(existingMsgSnapshot)
+              emit(
+                Result.loading(
+                  progressMsg = context.getString(R.string.processing),
+                  resultCode = R.id.progress_id_processing,
+                  progress = 90.toDouble()
+                )
+              )
+              emit(processingResult)
+            } else {
+              emit(
+                Result.loading(
+                  progressMsg = context.getString(R.string.connection),
+                  resultCode = R.id.progress_id_connecting
+                )
+              )
+              val newMsgSnapshot = try {
+                loadMessageFromServer(messageEntity)
+              } catch (e: Exception) {
+                e.printStackTraceIfDebugOnly()
+                emit(Result.exception(e))
+                return@flow
+              }
+              setSeenStatusInternal(msgEntity = messageEntity, isSeen = true)
+              emit(
+                Result.loading(
+                  progressMsg = context.getString(R.string.processing),
+                  resultCode = R.id.progress_id_processing,
+                  progress = 70.toDouble()
+                )
+              )
+              val processingResult = processingMsgSnapshot(newMsgSnapshot)
+              emit(
+                Result.loading(
+                  progressMsg = context.getString(R.string.processing),
+                  resultCode = R.id.progress_id_processing,
+                  progress = 90.toDouble()
+                )
+              )
+              emit(processingResult)
+            }
+          }
+        } catch (e: Exception) {
+          e.printStackTraceIfDebugOnly()
+          emit(Result.exception(e))
+        }
+      }
+    }
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  val processedMessageFlow: Flow<Result<MessagesInThreadListAdapter.Message>> =
+    processedMimeMessageResultFlow.flatMapLatest {
+    flow {
+      val context: Context = getApplication()
+      val result = when (it.status) {
+        Result.Status.LOADING -> {
+          Result.loading(
+            requestCode = it.requestCode,
+            resultCode = it.resultCode,
+            progressMsg = it.progressMsg,
+            progress = it.progress
+          )
+        }
+
+        Result.Status.SUCCESS -> {
+          val processedMimeMessageResult = it.data
+          if (processedMimeMessageResult != null) {
+            try {
+              val messageEntity = roomDatabase.msgDao().getMsgSuspend(
+                message.messageEntity.account,
+                message.messageEntity.folder,
+                message.messageEntity.uid,
+              ) ?: message.messageEntity
+              val incomingMessageInfo = IncomingMessageInfo(
+                msgEntity = messageEntity,
+                localFolder = LocalFolder(messageEntity.account, messageEntity.folder),
+                text = processedMimeMessageResult.text,
+                inlineSubject = processedMimeMessageResult.blocks.firstOrNull {
+                  it.type == MsgBlock.Type.ENCRYPTED_SUBJECT
+                }?.content?.let {
+                  context.getString(R.string.encrypted_subject_template, it)
+                },
+                msgBlocks = processedMimeMessageResult.blocks,
+                encryptionType = if (processedMimeMessageResult.verificationResult.hasEncryptedParts) {
+                  MessageEncryptionType.ENCRYPTED
+                } else {
+                  MessageEncryptionType.STANDARD
+                },
+                verificationResult = processedMimeMessageResult.verificationResult
+              )
+
+              val activeAccount = getActiveAccountSuspend() ?: error("No active account")
+
+              val attachments = roomDatabase.attachmentDao().getAttachments(
+                account = activeAccount.email,
+                accountType = activeAccount.accountType,
+                label = messageEntity.folder,
+                uid = messageEntity.uid
+              ).map { it.toAttInfo() }
+
+              val inlinedAttachmentInfoList = mutableListOf<AttachmentInfo>()
+
+              for (block in incomingMessageInfo.msgBlocks ?: emptyList()) {
+                when (block) {
+                  is AttMsgBlock -> {
+                    inlinedAttachmentInfoList.add(
+                      block.toAttachmentInfo().copy(
+                        email = activeAccount.email,
+                        uid = messageEntity.uid,
+                        folder = messageEntity.folder,
+                        path = "${inlinedAttachmentInfoList.size}"
+                      )
+                    )
+                  }
+                }
+              }
+
+              Result.success(
+                requestCode = it.requestCode,
+                data = message.copy(
+                  messageEntity = messageEntity,
+                  incomingMessageInfo = incomingMessageInfo,
+                  attachments = attachments + inlinedAttachmentInfoList
+                )
+              )
+            } catch (e: Exception) {
+              Result.exception(requestCode = it.requestCode, throwable = e)
+            }
+          } else {
+            Result.exception(
+              requestCode = it.requestCode,
+              throwable = IllegalStateException(context.getString(R.string.unknown_error))
+            )
+          }
+        }
+
+        Result.Status.ERROR -> {
+          Result.exception(
+            requestCode = it.requestCode,
+            throwable = RuntimeException()
+          )
+        }
+
+        Result.Status.EXCEPTION -> {
+          Result.exception(
+            requestCode = it.requestCode, throwable = it.exception
+              ?: IllegalStateException(context.getString(R.string.unknown_error))
+          )
+        }
+
+        Result.Status.NONE -> {
+          Result.none()
+        }
+      }
+
+      emit(result)
+    }
+  }
+
+  fun retry() {
+    viewModelScope.launch {
+      triggerMutableStateFlow.value = Trigger(message.messageEntity)
+    }
+  }
+
+  private suspend fun processingMsgSnapshot(msgSnapshot: DiskLruCache.Snapshot):
+      Result<PgpMsg.ProcessedMimeMessageResult?> = withContext(Dispatchers.IO) {
+    val accountEntity = getActiveAccountSuspend()
+      ?: throw java.lang.NullPointerException("Account is null")
+
+    return@withContext msgSnapshot.processing(
+      context = getApplication(),
+      accountEntity = accountEntity,
+      skipAttachmentsRawData
+    ) { blocks ->
+      preResultsProcessing(blocks)
+    }
+  }
+
+  private suspend fun loadMessageFromServer(messageEntity: MessageEntity): DiskLruCache.Snapshot =
+    withContext(Dispatchers.IO) {
+      val accountEntity = getActiveAccountSuspend()
+        ?: throw java.lang.NullPointerException("Account is null")
+      val context: Context = getApplication()
+
+      val result = GmailApiHelper.executeWithResult {
+        val msgFullInfo = GmailApiHelper.loadMsgInfoSuspend(
+          context = getApplication(),
+          accountEntity = accountEntity,
+          msgId = messageEntity.uidAsHEX,
+          fields = null,
+          format = GmailApiHelper.RESPONSE_FORMAT_FULL
+        )
+        val originalMsg = GmaiAPIMimeMessage(
+          message = msgFullInfo,
+          context = getApplication(),
+          accountEntity = accountEntity
+        )
+        if (originalMsg.isMimeType(JavaEmailConstants.MIME_TYPE_MULTIPART)) {
+          MsgsCacheManager.storeMsg(
+            key = messageEntity.id.toString(),
+            msg = originalMsg,
+            accountEntity = accountEntity
+          )
+        } else {
+          MsgsCacheManager.storeMsg(
+            key = messageEntity.id.toString(),
+            inputStream = GmailApiHelper.getWholeMimeMessageInputStream(
+              context = getApplication(),
+              account = accountEntity,
+              messageId = msgFullInfo.id
+            ),
+            accountEntity = accountEntity
+          )
+        }
+
+        GmailApiHelper.changeLabels(
+          context = getApplication(),
+          accountEntity = accountEntity,
+          ids = listOf(messageEntity.uidAsHEX),
+          removeLabelIds = listOf(GmailApiHelper.LABEL_UNREAD)
+        )
+
+        Result.success(null)
+      }
+      if (result.status == Result.Status.SUCCESS) {
+        val snapshot =
+          MsgsCacheManager.getMsgSnapshotWithRetryStrategy(messageEntity.id.toString())
+        return@withContext snapshot
+          ?: throw java.lang.NullPointerException("Message not found in the local cache (GOOGLE API)")
+      } else throw result.exception ?: java.lang.IllegalStateException(
+        context.getString(
+          R
+            .string.unknown_error
+        )
+      )
+    }
+
+  private suspend fun preResultsProcessing(blocks: List<MsgBlock>) {
+    for (block in blocks) {
+      when (block) {
+        is PublicKeyMsgBlock -> {
+          val keyDetails = block.keyDetails ?: continue
+          val recipient = keyDetails.mimeAddresses.firstOrNull()?.address ?: continue
+          block.existingRecipientWithPubKeys =
+            roomDatabase.recipientDao().getRecipientWithPubKeysByEmailSuspend(recipient)
+          try {
+            block.existingRecipientWithPubKeys?.publicKeys?.forEach {
+              it.pgpKeyRingDetails =
+                PgpKey.parseKeys(source = it.publicKey).pgpKeyDetailsList.firstOrNull()
+            }
+          } catch (e: Exception) {
+            e.printStackTrace()
+          }
+        }
+      }
+    }
+  }
+
+  private suspend fun setSeenStatusInternal(
+    msgEntity: MessageEntity,
+    isSeen: Boolean,
+    usePending: Boolean = false
+  ) = withContext(Dispatchers.IO) {
+    if (msgEntity.isSeen == isSeen) return@withContext
+    roomDatabase.msgDao().updateSuspend(
+      msgEntity.copy(
+        state = if (usePending) {
+          if (isSeen) MessageState.PENDING_MARK_READ.value else MessageState.PENDING_MARK_UNREAD.value
+        } else msgEntity.state,
+        flags = if (isSeen) {
+          if (msgEntity.flags?.contains(MessageFlag.SEEN.value) == true) {
+            msgEntity.flags
+          } else {
+            msgEntity.flags?.plus("${MessageFlag.SEEN.value} ")
+          }
+        } else {
+          msgEntity.flags?.replace(MessageFlag.SEEN.value, "")
+        }
+      )
+    )
+  }
+
+  data class Trigger(
+    val messageEntity: MessageEntity? = null,
+    val id: Long = System.currentTimeMillis()
+  )
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ThreadDetailsViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ThreadDetailsViewModel.kt
new file mode 100644
index 0000000000..1a48c635b7
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ThreadDetailsViewModel.kt
@@ -0,0 +1,744 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.jetpack.viewmodel
+
+import android.app.Application
+import android.content.Context
+import androidx.lifecycle.viewModelScope
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.FoldersManager
+import com.flowcrypt.email.api.email.JavaEmailConstants
+import com.flowcrypt.email.api.email.MsgsCacheManager
+import com.flowcrypt.email.api.email.gmail.GmailApiHelper
+import com.flowcrypt.email.api.email.gmail.model.GmailThreadInfo
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.api.email.model.MessageFlag
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.database.MessageState
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.database.entity.RecipientEntity
+import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
+import com.flowcrypt.email.extensions.com.flowcrypt.email.util.processing
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.getInReplyTo
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.getMessageId
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.isDraft
+import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.toThreadInfo
+import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
+import com.flowcrypt.email.model.MessageAction
+import com.flowcrypt.email.ui.adapter.MessagesInThreadListAdapter
+import com.flowcrypt.email.ui.adapter.MessagesInThreadListAdapter.Message
+import com.flowcrypt.email.util.RecipientLookUpManager
+import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
+import com.flowcrypt.email.util.exception.ThreadNotFoundException
+import jakarta.mail.Message.RecipientType
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * @author Denys Bondarenko
+ */
+class ThreadDetailsViewModel(
+  private val threadMessageEntityId: Long,
+  private val localFolder: LocalFolder,
+  application: Application
+) : AccountViewModel(application) {
+  private val controlledRunnerForLoadingMessages = ControlledRunner<Result<Data>>()
+  private val loadMessagesManuallyMutableStateFlow: MutableStateFlow<Result<Data>> =
+    MutableStateFlow(Result.none())
+  private val loadMessagesManuallyStateFlow: StateFlow<Result<Data>> =
+    loadMessagesManuallyMutableStateFlow.asStateFlow()
+  val threadMessageEntityFlow =
+    roomDatabase.msgDao().getMessageByIdFlow(threadMessageEntityId)
+      .stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(5000),
+        initialValue = null
+      )
+
+  private val recipientLookUpManager = RecipientLookUpManager(
+    application = application,
+    roomDatabase = roomDatabase
+  ) { recipientInfo ->
+    sessionFromRecipientsMutableStateFlow.update {
+      it.toMutableSet().apply { add(recipientInfo) }
+    }
+  }
+
+  private val sessionFromRecipientsMutableStateFlow: MutableStateFlow<Set<RecipientLookUpManager.RecipientInfo>> =
+    MutableStateFlow(emptySet())
+  val sessionFromRecipientsStateFlow: StateFlow<Set<RecipientLookUpManager.RecipientInfo>> =
+    sessionFromRecipientsMutableStateFlow.asStateFlow()
+
+  val allOutboxMessagesFlow = roomDatabase.msgDao().getAllOutboxMessagesFlow()
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  val localFolderFlow: StateFlow<LocalFolder?> =
+    threadMessageEntityFlow.mapLatest { threadMessageEntity ->
+      val activeAccount = getActiveAccountSuspend()
+        ?: return@mapLatest null
+      val foldersManager = FoldersManager.fromDatabaseSuspend(getApplication(), activeAccount)
+      return@mapLatest foldersManager.getFolderByFullName(threadMessageEntity?.folder)
+    }.stateIn(
+      scope = viewModelScope,
+      started = SharingStarted.WhileSubscribed(5000),
+      initialValue = null
+    )
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  private val threadHeaderFlow = threadMessageEntityFlow.mapLatest {
+    prepareThreadHeader(it)
+  }.distinctUntilChanged()
+
+  val messagesInThreadFlow =
+    merge(
+      //this flow will be used once to load messages at the start up
+      flow {
+        emit(Result.loading())
+        emit(loadMessagesInternal(clearCache = true))
+      },
+      //this flow will be used to trigger loading messages manually, for example after connection issue
+      loadMessagesManuallyStateFlow
+    ).stateIn(
+      scope = viewModelScope,
+      started = SharingStarted.WhileSubscribed(5000),
+      initialValue = Result.none()
+    )
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  val messageActionsAvailabilityStateFlow =
+    threadMessageEntityFlow.mapLatest { threadMessageEntity ->
+    val activeAccount = getActiveAccountSuspend()
+      ?: return@mapLatest MessageAction.entries.associateBy({ it }, { false })
+    val foldersManager = FoldersManager.fromDatabaseSuspend(getApplication(), activeAccount)
+    MessageAction.entries.associateBy({ it }, { false }).toMutableMap().apply {
+      val folderType =
+        foldersManager.getFolderByFullName(threadMessageEntity?.folder)?.getFolderType()
+      if (activeAccount.isGoogleSignInAccount) {
+        val labelIds =
+          threadMessageEntity?.labelIds?.split(MessageEntity.LABEL_IDS_SEPARATOR).orEmpty()
+        this[MessageAction.ARCHIVE] = labelIds.contains(JavaEmailConstants.FOLDER_INBOX)
+        this[MessageAction.MOVE_TO_INBOX] =
+          folderType !in setOf(FoldersManager.FolderType.OUTBOX, FoldersManager.FolderType.SPAM)
+              && !labelIds.contains(JavaEmailConstants.FOLDER_INBOX)
+        this[MessageAction.CHANGE_LABELS] = folderType != FoldersManager.FolderType.OUTBOX
+        this[MessageAction.MARK_AS_NOT_SPAM] =
+          folderType in setOf(FoldersManager.FolderType.JUNK, FoldersManager.FolderType.SPAM)
+      } else {
+        this[MessageAction.MOVE_TO_INBOX] = folderType !in listOf(
+          FoldersManager.FolderType.TRASH,
+          FoldersManager.FolderType.DRAFTS,
+          FoldersManager.FolderType.OUTBOX,
+        )
+      }
+
+      this[MessageAction.MARK_UNREAD] =
+        !JavaEmailConstants.FOLDER_OUTBOX.equals(threadMessageEntity?.folder, ignoreCase = true)
+
+      if (folderType != null) {
+        when (folderType) {
+          FoldersManager.FolderType.SENT -> {
+            this[MessageAction.DELETE] = true
+            this[MessageAction.MOVE_TO_SPAM] =
+              AccountEntity.ACCOUNT_TYPE_GOOGLE == activeAccount.accountType
+          }
+
+          FoldersManager.FolderType.DRAFTS,
+          FoldersManager.FolderType.OUTBOX,
+          FoldersManager.FolderType.JUNK,
+          FoldersManager.FolderType.SPAM -> {
+            this[MessageAction.DELETE] = true
+            this[MessageAction.MOVE_TO_SPAM] = false
+          }
+
+          else -> {
+            this[MessageAction.DELETE] = true
+            this[MessageAction.MOVE_TO_SPAM] = true
+          }
+        }
+      } else {
+        this[MessageAction.DELETE] = true
+        this[MessageAction.MOVE_TO_SPAM] = false
+      }
+
+      if (foldersManager.folderTrash == null || localFolder.isDrafts) {
+        this[MessageAction.DELETE] = false
+      }
+    }
+  }.stateIn(
+    scope = viewModelScope,
+    started = SharingStarted.WhileSubscribed(5000),
+    initialValue = MessageAction.entries.associateBy({ it }, { false })
+  )
+
+  private val sessionMessageStateMutableStateFlow: MutableStateFlow<MessageState?> =
+    MutableStateFlow(null)
+  val sessionMessageStateStateFlow: StateFlow<MessageState?> =
+    sessionMessageStateMutableStateFlow.asStateFlow()
+
+  init {
+    subscribeToAutomaticallyUpdateLabels()
+    viewModelScope.launch {
+      keepThreadMessageEntityFresh()
+    }
+
+    viewModelScope.launch {
+      setupAutoSignatureReVerification()
+    }
+  }
+
+  fun loadMessages(
+    clearCache: Boolean = false,
+    silentUpdate: Boolean = false,
+    delayInMilliseconds: Long = 0
+  ) {
+    viewModelScope.launch {
+      if (!silentUpdate) {
+        loadMessagesManuallyMutableStateFlow.value = Result.loading()
+      }
+
+      if (delayInMilliseconds > 0) {
+        delay(delayInMilliseconds)
+      }
+
+      loadMessagesManuallyMutableStateFlow.value =
+        controlledRunnerForLoadingMessages.cancelPreviousThenRun {
+          return@cancelPreviousThenRun loadMessagesInternal(
+            clearCache = clearCache,
+            silentUpdate = silentUpdate
+          )
+        }
+    }
+  }
+
+  fun deleteMessageFromCache(message: Message) {
+    viewModelScope.launch {
+      if (loadMessagesManuallyMutableStateFlow.value.status == Result.Status.SUCCESS) {
+        loadMessagesManuallyMutableStateFlow.value.data?.list?.let { list ->
+          if (list.contains(message)) {
+            loadMessagesManuallyMutableStateFlow.update {
+              Result.success(Data(silentUpdate = true, list = list - message))
+            }
+          }
+        }
+      }
+    }
+  }
+
+  fun onMessageClicked(message: Message) {
+    val currentValue = messagesInThreadFlow.value
+    if (currentValue.status == Result.Status.SUCCESS) {
+      val currentList = messagesInThreadFlow.value.data?.list?.toMutableList() ?: return
+      loadMessagesManuallyMutableStateFlow.update {
+        currentList.replaceAll {
+          if (it.id == message.id) {
+            message.copy(
+              type = if (message.type == MessagesInThreadListAdapter.Type.MESSAGE_EXPANDED) {
+                MessagesInThreadListAdapter.Type.MESSAGE_COLLAPSED
+              } else {
+                MessagesInThreadListAdapter.Type.MESSAGE_EXPANDED
+              }
+            )
+          } else it
+        }
+        currentValue.copy(data = currentValue.data?.copy(list = currentList.toList()))
+      }
+    }
+  }
+
+  fun onHeadersDetailsClick(message: Message) {
+    val currentValue = messagesInThreadFlow.value
+    if (currentValue.status == Result.Status.SUCCESS) {
+      val currentList = messagesInThreadFlow.value.data?.list?.toMutableList() ?: return
+      loadMessagesManuallyMutableStateFlow.update {
+        currentList.replaceAll {
+          if (it.id == message.id) {
+            message.copy(isHeadersDetailsExpanded = !message.isHeadersDetailsExpanded)
+          } else it
+        }
+        currentValue.copy(data = currentValue.data?.copy(list = currentList.toList()))
+      }
+    }
+  }
+
+  fun onMessageChanged(messageWithChanges: Message) {
+    val currentValue = messagesInThreadFlow.value
+    if (currentValue.status == Result.Status.SUCCESS) {
+      val currentList = messagesInThreadFlow.value.data?.list?.toMutableList()
+      val cachedMessage = currentList?.firstOrNull { it.id == messageWithChanges.id } ?: return
+      if (cachedMessage != messageWithChanges) {
+        loadMessagesManuallyMutableStateFlow.update {
+          currentList.replaceAll {
+            if (it.id == messageWithChanges.id) {
+              messageWithChanges
+            } else {
+              it
+            }
+          }
+          currentValue.copy(data = currentValue.data?.copy(list = currentList.toList()))
+        }
+      }
+    }
+  }
+
+  fun getMessageActionAvailability(messageAction: MessageAction): Boolean {
+    return messageActionsAvailabilityStateFlow.value[messageAction] ?: false
+  }
+
+  fun changeMsgState(newMsgState: MessageState) {
+    val freshMsgEntity = threadMessageEntityFlow.value
+    freshMsgEntity?.let { messageEntity ->
+      viewModelScope.launch {
+        val candidate: MessageEntity = when (newMsgState) {
+          MessageState.PENDING_MARK_READ -> {
+            messageEntity.copy(
+              state = newMsgState.value,
+              flags = if (messageEntity.flags?.contains(MessageFlag.SEEN.value) == true) {
+                messageEntity.flags
+              } else {
+                messageEntity.flags?.plus("${MessageFlag.SEEN.value} ")
+              }
+            )
+          }
+
+          MessageState.PENDING_MARK_UNREAD -> {
+            messageEntity.copy(
+              state = newMsgState.value,
+              flags = messageEntity.flags?.replace(MessageFlag.SEEN.value, "")
+            )
+          }
+
+          else -> {
+            messageEntity.copy(state = newMsgState.value)
+          }
+        }
+
+        roomDatabase.msgDao().updateSuspend(candidate)
+        sessionMessageStateMutableStateFlow.value = newMsgState
+      }
+    }
+  }
+
+  fun deleteThread() {
+    val freshMsgEntity = threadMessageEntityFlow.value
+    freshMsgEntity?.let { messageEntity ->
+      viewModelScope.launch {
+        roomDatabase.msgDao().deleteSuspend(messageEntity)
+
+        val accountEntity = getActiveAccountSuspend() ?: return@launch
+
+        if (JavaEmailConstants.FOLDER_OUTBOX.equals(messageEntity.folder, ignoreCase = true)) {
+          val outgoingMsgCount =
+            roomDatabase.msgDao().getOutboxMsgsSuspend(messageEntity.account).size
+          val outboxLabel = roomDatabase.labelDao().getLabelSuspend(
+            account = accountEntity.email,
+            accountType = accountEntity.accountType,
+            label = JavaEmailConstants.FOLDER_OUTBOX
+          )
+
+          outboxLabel?.let {
+            roomDatabase.labelDao().updateSuspend(it.copy(messagesTotal = outgoingMsgCount))
+          }
+        }
+      }
+    }
+  }
+
+  fun fetchAndUpdateInfoAboutRecipients(from: Collection<String>) {
+    viewModelScope.launch {
+      from.forEach {
+        recipientLookUpManager.enqueue(
+          RecipientLookUpManager.RecipientInfo(
+            FROM,
+            RecipientWithPubKeys(
+              RecipientEntity(id = System.currentTimeMillis(), email = it),
+              emptyList()
+            )
+          )
+        )
+      }
+    }
+  }
+
+  class FROM : RecipientType("From")
+
+  private suspend fun loadMessagesInternal(
+    clearCache: Boolean = false,
+    silentUpdate: Boolean = false
+  ): Result<Data> {
+    val threadMessageEntity =
+      roomDatabase.msgDao().getMsgById(threadMessageEntityId) ?: return Result.exception(
+        IllegalStateException("Message does not exist")
+      )
+    val activeAccount =
+      getActiveAccountSuspend() ?: return Result.exception(IllegalStateException())
+    if (threadMessageEntity.threadIdAsHEX.isNullOrEmpty() || !activeAccount.isGoogleSignInAccount) {
+      return Result.success(Data(silentUpdate = silentUpdate, list = listOf()))
+    } else {
+      try {
+        val thread = GmailApiHelper.getThread(
+          context = getApplication(),
+          accountEntity = activeAccount,
+          threadId = threadMessageEntity.threadIdAsHEX,
+          format = GmailApiHelper.RESPONSE_FORMAT_FULL
+        ) ?: error("Thread not found")
+
+        val threadInfo = thread.toThreadInfo(getApplication(), activeAccount)
+
+        if (!threadInfo.labels.contains(localFolder.fullName)) {
+          val context: Context = getApplication()
+          throw ThreadNotFoundException(context.getString(R.string.thread_was_deleted_or_moved))
+        }
+
+        //keep thread info updated in the local cache
+        roomDatabase.msgDao().updateSuspend(
+          MessageEntity.genMessageEntities(
+            context = getApplication(),
+            account = activeAccount.email,
+            accountType = activeAccount.accountType,
+            label = getFolderFullName(),
+            msgsList = listOf(threadInfo.lastMessage),
+            isNew = false,
+            onlyPgpModeEnabled = activeAccount.showOnlyEncrypted ?: false
+          ) { message, messageEntity ->
+            if (message.threadId == threadMessageEntity.threadIdAsHEX) {
+              messageEntity.toUpdatedThreadCopy(threadMessageEntity, threadInfo)
+            } else messageEntity
+          })
+
+        val messagesInThread = (thread.messages ?: emptyList()).toMutableList().apply {
+          //try to put drafts in the right position
+          val drafts = filter { it.isDraft() }
+          drafts.forEach { draft ->
+            val inReplyToValue = draft.getInReplyTo()
+            val inReplyToMessage = firstOrNull { it.getMessageId() == inReplyToValue }
+
+            if (inReplyToMessage != null) {
+              val inReplyToMessagePosition = indexOf(inReplyToMessage)
+              if (inReplyToMessagePosition != -1) {
+                remove(draft)
+                if (size >= inReplyToMessagePosition + 1) {
+                  add(inReplyToMessagePosition + 1, draft)
+                } else {
+                  add(draft)
+                }
+              }
+            }
+          }
+        }
+
+        val fetchedDraftIdsMap = if (messagesInThread.any { it.isDraft() }) {
+          GmailApiHelper.loadBaseDraftInfoInParallel(
+            context = getApplication(),
+            accountEntity = activeAccount,
+            messages = messagesInThread.filter { it.isDraft() }
+          ).associateBy({ it.message.id }, { it.id })
+        } else emptyMap()
+
+        val isOnlyPgpModeEnabled = activeAccount.showOnlyEncrypted ?: false
+        val messageEntitiesBasedOnServerResult = MessageEntity.genMessageEntities(
+          context = getApplication(),
+          account = activeAccount.email,
+          accountType = activeAccount.accountType,
+          label = getFolderFullName(),
+          msgsList = messagesInThread,
+          isNew = false,
+          onlyPgpModeEnabled = isOnlyPgpModeEnabled,
+          draftIdsMap = fetchedDraftIdsMap
+        ) { message, messageEntity ->
+          messageEntity.copy(snippet = message.snippet, isVisible = false)
+        }
+        val setOfUIDsBasedOnServerResult = messageEntitiesBasedOnServerResult.map { it.uid }.toSet()
+
+        if (clearCache) {
+          threadMessageEntity.threadId?.let {
+            roomDatabase.msgDao().clearCacheForGmailThread(
+              account = activeAccount.email,
+              folder = getFolderFullName(),
+              threadId = it
+            )
+          }
+        }
+
+        var cachedEntities = roomDatabase.msgDao().getMessagesForGmailThread(
+          activeAccount.email,
+          getFolderFullName(),
+          threadMessageEntity.threadId ?: 0,
+        )
+
+        val candidatesToBeInserted = mutableListOf<MessageEntity>()
+        val candidatesToBeUpdated = mutableListOf<MessageEntity>()
+        messageEntitiesBasedOnServerResult.forEach { entity ->
+          val existingVersion = cachedEntities.firstOrNull { it.uid == entity.uid }
+          if (existingVersion == null) {
+            candidatesToBeInserted.add(entity)
+          } else if (existingVersion.copy(id = null) != entity) {
+            candidatesToBeUpdated.add(entity.copy(id = existingVersion.id))
+            if (existingVersion.flags != entity.flags) {
+              MsgsCacheManager.removeMessage(existingVersion.id.toString())
+            }
+          }
+        }
+        val candidatesToBeDeleted =
+          cachedEntities.filter { it.uid !in setOfUIDsBasedOnServerResult }
+
+        roomDatabase.msgDao().insertSuspend(candidatesToBeInserted)
+        roomDatabase.msgDao().updateSuspend(candidatesToBeUpdated)
+        roomDatabase.msgDao().deleteSuspend(candidatesToBeDeleted)
+
+        GmailApiHelper.identifyAttachments(
+          msgEntities = messageEntitiesBasedOnServerResult,
+          msgs = messagesInThread,
+          account = activeAccount,
+          localFolder = if (localFolder.searchQuery == null) {
+            localFolder
+          } else {
+            localFolder.copy(fullName = JavaEmailConstants.FOLDER_SEARCH)
+          },
+          roomDatabase = roomDatabase
+        )
+
+        //get the freshest info from the local database
+        cachedEntities = roomDatabase.msgDao().getMessagesForGmailThread(
+          activeAccount.email,
+          getFolderFullName(),
+          threadMessageEntity.threadId ?: 0,
+        )
+
+        val currentList = messagesInThreadFlow.value.data?.list ?: emptyList()
+        val finalList = messageEntitiesBasedOnServerResult.map { fromServerMessageEntity ->
+          val messageEntity = fromServerMessageEntity.copy(
+            id = cachedEntities.firstOrNull { it.uid == fromServerMessageEntity.uid }?.id
+          )
+          val messageItemBasedOnDataFromServer = Message(
+            messageEntity = messageEntity,
+            type = MessagesInThreadListAdapter.Type.MESSAGE_COLLAPSED,
+            isHeadersDetailsExpanded = false,
+            attachments = emptyList()
+          )
+
+          // this code prevent redundant UI updates
+          currentList.firstOrNull {
+            it.id == messageItemBasedOnDataFromServer.id
+          }?.let { item ->
+            val existingMessageItem = item as Message
+            if (existingMessageItem.messageEntity.flags != messageEntity.flags) {
+              messageItemBasedOnDataFromServer
+            } else {
+              existingMessageItem.copy(messageEntity = messageEntity)
+            }
+          } ?: messageItemBasedOnDataFromServer
+        }
+
+        val threadHeader = prepareThreadHeader(
+          messageEntity = roomDatabase.msgDao().getMsgById(threadMessageEntityId),
+          threadInfo = threadInfo
+        )
+
+        return Result.success(
+          Data(
+            silentUpdate = silentUpdate,
+            list = listOf(threadHeader) + finalList
+          )
+        )
+      } catch (e: Exception) {
+        e.printStackTraceIfDebugOnly()
+        return Result.exception(e)
+      }
+    }
+  }
+
+  private suspend fun prepareThreadHeader(
+    messageEntity: MessageEntity?,
+    threadInfo: GmailThreadInfo? = null
+  ): MessagesInThreadListAdapter.ThreadHeader =
+    withContext(Dispatchers.IO) {
+      val account =
+        getActiveAccountSuspend() ?: return@withContext MessagesInThreadListAdapter.ThreadHeader(
+          "",
+          emptyList()
+        )
+      val labelEntities =
+        roomDatabase.labelDao().getLabelsSuspend(account.email, account.accountType)
+      val cachedLabelIds =
+        messageEntity?.labelIds?.split(MessageEntity.LABEL_IDS_SEPARATOR)
+
+      return@withContext try {
+        //try to get the last changes from a server
+        val latestLabelIds = (threadInfo ?: GmailApiHelper.loadThreadInfo(
+          context = getApplication(),
+          accountEntity = account,
+          threadId = messageEntity?.threadIdAsHEX ?: "",
+          fields = listOf("id", "messages/labelIds"),
+          format = GmailApiHelper.RESPONSE_FORMAT_MINIMAL
+        ))?.labels ?: error("Thread not found")
+        if (cachedLabelIds == null
+          || !(latestLabelIds.containsAll(cachedLabelIds)
+              && cachedLabelIds.containsAll(latestLabelIds))
+        ) {
+          messageEntity?.copy(
+            labelIds = latestLabelIds.joinToString(MessageEntity.LABEL_IDS_SEPARATOR)
+          )?.let { roomDatabase.msgDao().updateSuspend(it) }
+        }
+        MessagesInThreadListAdapter.ThreadHeader(
+          messageEntity?.subject,
+          MessageEntity.generateColoredLabels(latestLabelIds, labelEntities)
+        )
+      } catch (e: Exception) {
+        MessagesInThreadListAdapter.ThreadHeader(
+          messageEntity?.subject,
+          MessageEntity.generateColoredLabels(cachedLabelIds, labelEntities)
+        )
+      }
+    }
+
+  private fun subscribeToAutomaticallyUpdateLabels() {
+    viewModelScope.launch {
+      threadHeaderFlow.collectLatest { threadHeader ->
+        val existingResult = messagesInThreadFlow.value
+        if (existingResult.data?.list.isNullOrEmpty()) {
+          return@collectLatest
+        } else {
+          loadMessagesManuallyMutableStateFlow.update {
+            val existingValue = existingResult.data ?: Data(false, emptyList())
+            val updatedList = existingValue.list.toMutableList().apply {
+              replaceAll { item ->
+                if (item.type == MessagesInThreadListAdapter.Type.HEADER) {
+                  (item as MessagesInThreadListAdapter.ThreadHeader).copy(labels = threadHeader.labels)
+                } else {
+                  item
+                }
+              }
+            }
+            Result.success(existingValue.copy(list = updatedList))
+          }
+        }
+      }
+    }
+  }
+
+  private suspend fun keepThreadMessageEntityFresh() {
+    messagesInThreadFlow.collectLatest {
+      if (it.status == Result.Status.SUCCESS) {
+        val messageItems = it.data?.list?.filterIsInstance<Message>() ?: return@collectLatest
+        if (messageItems.isEmpty()) {
+          return@collectLatest
+        }
+
+        val threadMessageEntity =
+          roomDatabase.msgDao().getMsgById(threadMessageEntityId) ?: return@collectLatest
+
+        val isThreadFullySeen = messageItems.all { item -> item.messageEntity.isSeen }
+        if (threadMessageEntity.isSeen != isThreadFullySeen) {
+          roomDatabase.msgDao().getMsgById(threadMessageEntityId)?.let { messageEntity ->
+            roomDatabase.msgDao().updateSuspend(
+              messageEntity.copy(
+                labelIds = messageEntity.labelIds
+                  ?.split(MessageEntity.LABEL_IDS_SEPARATOR)
+                  ?.toMutableSet()
+                  ?.apply {
+                    remove(GmailApiHelper.LABEL_UNREAD)
+                  }?.joinToString(MessageEntity.LABEL_IDS_SEPARATOR),
+                flags = if (isThreadFullySeen) {
+                  if (messageEntity.flags?.contains(MessageFlag.SEEN.value) == true) {
+                    messageEntity.flags
+                  } else {
+                    messageEntity.flags?.plus("${MessageFlag.SEEN.value} ")
+                  }
+                } else {
+                  messageEntity.flags?.replace(MessageFlag.SEEN.value, "")
+                }
+              )
+            )
+          }
+        }
+      }
+    }
+  }
+
+  private suspend fun setupAutoSignatureReVerification() {
+    sessionFromRecipientsStateFlow.collectLatest {
+      if (!recipientLookUpManager.hasActiveJobs() && it.isNotEmpty()) {
+        val recipientsWithUsablePubKey = sessionFromRecipientsStateFlow.value
+          .filter { recipientInfo ->
+            recipientInfo.recipientWithPubKeys.hasUsablePubKey()
+          }.map { recipientInfo ->
+            recipientInfo.recipientWithPubKeys.recipient.email
+          }
+
+        val messagesWithActiveSignatureVerification = messagesInThreadFlow.value.data?.list
+          ?.filterIsInstance<Message>()
+          ?.filter { message ->
+            message.hasActiveSignatureVerification
+          } ?: emptyList()
+
+        messagesWithActiveSignatureVerification.forEach { message ->
+          val messageFromAddresses = message.incomingMessageInfo?.getFrom()
+            ?.map { internetAddress ->
+              internetAddress.address.lowercase()
+            } ?: emptyList()
+
+          if (recipientsWithUsablePubKey.containsAll(messageFromAddresses)) {
+            try {
+              val messageEntity = message.messageEntity
+              val existedMsgSnapshot =
+                requireNotNull(MsgsCacheManager.getMsgSnapshot(messageEntity.id.toString()))
+              val verificationResult = requireNotNull(
+                existedMsgSnapshot.processing(
+                  context = getApplication(),
+                  accountEntity = getActiveAccountSuspend() ?: error("Account is null"),
+                  skipAttachmentsRawData = true
+                ).data?.verificationResult
+              )
+              onMessageChanged(
+                message.copy(
+                  incomingMessageInfo = message.incomingMessageInfo?.copy(
+                    verificationResult = verificationResult
+                  ),
+                  hasActiveSignatureVerification = false
+                )
+              )
+            } catch (e: Exception) {
+              onMessageChanged(message.copy(hasActiveSignatureVerification = false))
+            }
+          } else {
+            onMessageChanged(message.copy(hasActiveSignatureVerification = false))
+          }
+        }
+      }
+    }
+  }
+
+  private fun getFolderFullName() = if (localFolder.searchQuery == null) {
+    localFolder.fullName
+  } else {
+    JavaEmailConstants.FOLDER_SEARCH
+  }
+
+  data class Data(
+    val silentUpdate: Boolean,
+    val list: List<MessagesInThreadListAdapter.Item>,
+    val timeSnapshot: Long = System.currentTimeMillis()
+  )
+
+  companion object {
+    val FROM = FROM()
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ThreadsViewPagerViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ThreadsViewPagerViewModel.kt
new file mode 100644
index 0000000000..0ae0be7d70
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ThreadsViewPagerViewModel.kt
@@ -0,0 +1,102 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.jetpack.viewmodel
+
+import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
+import androidx.lifecycle.switchMap
+import com.flowcrypt.email.api.email.JavaEmailConstants
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.database.entity.MessageEntity
+
+/**
+ * @author Denys Bondarenko
+ */
+class ThreadsViewPagerViewModel(
+  private val initialMessageEntityId: Long,
+  private val localFolder: LocalFolder,
+  application: Application
+) : AccountViewModel(application) {
+
+  val initialLiveData: LiveData<Result<List<MessageEntity>>> =
+    activeAccountLiveData.switchMap { accountEntity ->
+      liveData {
+        if (accountEntity != null) {
+          val middleMessageEntity =
+            roomDatabase.msgDao().getMsgById(initialMessageEntityId)
+
+          if (middleMessageEntity != null) {
+            emit(
+              Result.success(listOf(middleMessageEntity))
+            )
+          } else {
+            emit(
+              Result.exception(
+                IllegalStateException(
+                  "MessageEntity with id = $initialMessageEntityId not found"
+                )
+              )
+            )
+          }
+        } else {
+          emit(Result.exception(IllegalStateException("account is null")))
+        }
+      }
+    }
+
+  private val manuallySelectedMessageEntity: MutableLiveData<MessageEntity> = MutableLiveData()
+
+  val messageEntitiesLiveData: LiveData<Result<List<MessageEntity>>> =
+    manuallySelectedMessageEntity.switchMap { messageEntity ->
+      liveData {
+        emit(Result.loading())
+        val activeAccount = getActiveAccountSuspend()
+        if (activeAccount != null) {
+          val result = Result.success(
+            roomDatabase.msgDao()
+              .getMessagesForViewPager(
+                account = activeAccount.email,
+                folder = if (localFolder.searchQuery.isNullOrEmpty()) {
+                  localFolder.fullName
+                } else {
+                  JavaEmailConstants.FOLDER_SEARCH
+                },
+                date = messageEntity.receivedDate ?: 0,
+                limit = PAGE_SIZE / 2
+              )
+          )
+
+          emit(result)
+        } else {
+          emit(Result.success(emptyList()))
+        }
+      }
+    }
+
+  fun onItemSelected(messageEntity: MessageEntity) {
+    if (messageEntitiesLiveData.value?.data == null) {
+      manuallySelectedMessageEntity.value = messageEntity
+      return
+    }
+
+    val position = messageEntitiesLiveData.value?.data?.indexOf(messageEntity) ?: return
+    val listSize = messageEntitiesLiveData.value?.data?.size
+    if (listSize == null || listSize == 0) {
+      return
+    }
+
+    if (position <= listSize / 4 || position >= (listSize - listSize / 4)) {
+      manuallySelectedMessageEntity.value = messageEntity
+    }
+  }
+
+  companion object {
+    const val PAGE_SIZE = 30
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/DownloadForwardedAttachmentsWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/DownloadForwardedAttachmentsWorker.kt
index 843b41fed9..16b55fc88f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/DownloadForwardedAttachmentsWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/DownloadForwardedAttachmentsWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager
@@ -28,12 +28,12 @@ import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.LogsUtil
 import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.google.android.gms.common.util.CollectionUtils
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Folder
 import jakarta.mail.Store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.commons.io.FileUtils
+import org.eclipse.angus.mail.imap.IMAPFolder
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
@@ -122,9 +122,11 @@ class DownloadForwardedAttachmentsWorker(context: Context, params: WorkerParamet
         val msgEntity = detailsList[0]
         val msgAttsDir = File(attCacheDir, msgEntity.attachmentsDirectory!!)
         try {
-          val atts = roomDatabase.attachmentDao().getAttachmentsSuspend(
-            account.email,
-            JavaEmailConstants.FOLDER_OUTBOX, msgEntity.uid
+          val atts = roomDatabase.attachmentDao().getAttachments(
+            account = account.email,
+            accountType = account.accountType,
+            label = JavaEmailConstants.FOLDER_OUTBOX,
+            uid = msgEntity.uid
           ).filter { it.isForwarded }
 
           if (atts.isEmpty()) {
@@ -183,7 +185,7 @@ class DownloadForwardedAttachmentsWorker(context: Context, params: WorkerParamet
                   context = applicationContext,
                   accountEntity = account,
                   msgId = it,
-                  format = GmailApiHelper.MESSAGE_RESPONSE_FORMAT_FULL
+                  format = GmailApiHelper.RESPONSE_FORMAT_FULL
                 )
               }
               ?: return@withContext MessageState.ERROR_ORIGINAL_MESSAGE_MISSING
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/HandlePasswordProtectedMsgWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/HandlePasswordProtectedMsgWorker.kt
index e2ff0b9beb..93be459e71 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/HandlePasswordProtectedMsgWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/HandlePasswordProtectedMsgWorker.kt
@@ -32,7 +32,6 @@ import com.flowcrypt.email.util.LogsUtil
 import com.flowcrypt.email.util.OutgoingMessagesManager
 import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.google.gson.GsonBuilder
-import org.eclipse.angus.mail.util.MailConnectException
 import jakarta.activation.DataHandler
 import jakarta.mail.Address
 import jakarta.mail.Message
@@ -48,6 +47,7 @@ import kotlinx.coroutines.withContext
 import org.apache.commons.io.FilenameUtils
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection
+import org.eclipse.angus.mail.util.MailConnectException
 import org.pgpainless.util.Passphrase
 import java.io.ByteArrayOutputStream
 import java.io.FileNotFoundException
@@ -335,8 +335,9 @@ class HandlePasswordProtectedMsgWorker(context: Context, params: WorkerParameter
   }
 
   private suspend fun getAttachments(msgEntity: MessageEntity) =
-    roomDatabase.attachmentDao().getAttachmentsSuspend(
-      account = msgEntity.email,
+    roomDatabase.attachmentDao().getAttachments(
+      account = msgEntity.account,
+      accountType = msgEntity.accountType,
       label = JavaEmailConstants.FOLDER_OUTBOX,
       uid = msgEntity.uid
     ).map {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/MessagesSenderWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/MessagesSenderWorker.kt
index a8ab77081c..2f9c8e4ff5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/MessagesSenderWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/MessagesSenderWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager
@@ -19,6 +19,7 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import androidx.work.workDataOf
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.EmailUtil
@@ -44,9 +45,9 @@ import com.flowcrypt.email.util.exception.ForceHandlingException
 import com.google.android.gms.auth.UserRecoverableAuthException
 import com.google.android.gms.common.util.CollectionUtils
 import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException
+import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.client.http.FileContent
-import org.eclipse.angus.mail.imap.IMAPFolder
-import org.eclipse.angus.mail.util.MailConnectException
+import com.google.api.services.gmail.model.Draft
 import jakarta.mail.AuthenticationFailedException
 import jakarta.mail.Flags
 import jakarta.mail.Folder
@@ -58,6 +59,8 @@ import jakarta.mail.internet.MimeMessage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
+import org.eclipse.angus.mail.util.MailConnectException
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.FileOutputStream
@@ -227,44 +230,38 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
           msgStates = listOf(MessageState.QUEUED.value)
         )
 
-        if (CollectionUtils.isEmpty(list)) {
+        if (list.isEmpty()) {
           break
         }
 
-        val iterator = list.iterator()
-        var msgEntity: MessageEntity? = null
-
-        while (iterator.hasNext()) {
-          val tempMsgDetails = iterator.next()
-          if (tempMsgDetails.uid > lastMsgUID) {
-            msgEntity = tempMsgDetails
-            break
-          }
-        }
-
-        if (msgEntity == null) {
-          msgEntity = list[0]
+        var msgEntity = (list.firstOrNull { it.uid > lastMsgUID } ?: list.first()).apply {
+          lastMsgUID = uid
         }
 
-        lastMsgUID = msgEntity.uid
-
         try {
           roomDatabase.msgDao().resetMsgsWithSendingStateSuspend(account.email)
           roomDatabase.msgDao().updateSuspend(msgEntity.copy(state = MessageState.SENDING.value))
           delay(2000)
 
           val attachments = roomDatabase.attachmentDao()
-            .getAttachmentsSuspend(email, JavaEmailConstants.FOLDER_OUTBOX, msgEntity.uid)
+            .getAttachments(
+              account = email,
+              accountType = account.accountType,
+              label = JavaEmailConstants.FOLDER_OUTBOX,
+              uid = msgEntity.uid
+            )
           val isMsgSent = sendMsg(account, msgEntity, attachments, sess, store)
 
           if (!isMsgSent) {
             continue
           }
 
-          msgEntity = roomDatabase.msgDao()
+          val existingMessageEntity = roomDatabase.msgDao()
             .getMsgSuspend(email, JavaEmailConstants.FOLDER_OUTBOX, msgEntity.uid)
+            ?: return@withContext
+          msgEntity = existingMessageEntity
 
-          if (msgEntity != null && msgEntity.msgState === MessageState.SENT) {
+          if (msgEntity.msgState == MessageState.SENT) {
             roomDatabase.msgDao().deleteSuspend(msgEntity)
             OutgoingMessagesManager.deleteOutgoingMessage(
               applicationContext,
@@ -288,10 +285,10 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
           ExceptionUtil.handleError(e)
 
           if (!GeneralUtil.isConnected(applicationContext)) {
-            msgEntity?.let {
-              if (msgEntity.msgState !== MessageState.SENT) {
+            if (msgEntity.msgState != MessageState.SENT) {
+              msgEntity.copy(state = MessageState.QUEUED.value).let {
                 roomDatabase.msgDao()
-                  .updateSuspend(msgEntity.copy(state = MessageState.QUEUED.value))
+                  .updateSuspend(it)
               }
             }
             throw e
@@ -320,9 +317,9 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
               }
             }
 
-            msgEntity?.let {
+            msgEntity.copy(state = newMsgState.value, errorMsg = e.message).let {
               roomDatabase.msgDao()
-                .updateSuspend(msgEntity.copy(state = newMsgState.value, errorMsg = e.message))
+                .updateSuspend(it)
             }
           }
 
@@ -354,8 +351,12 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
         }
         val msgEntity = list.first()
         try {
-          val attachments = roomDatabase.attachmentDao()
-            .getAttachmentsSuspend(email, JavaEmailConstants.FOLDER_OUTBOX, msgEntity.uid)
+          val attachments = roomDatabase.attachmentDao().getAttachments(
+            account = email,
+            accountType = account.accountType,
+            label = JavaEmailConstants.FOLDER_OUTBOX,
+            uid = msgEntity.uid
+          )
 
           val mimeMsg = EmailUtil.createMimeMsg(applicationContext, sess, msgEntity, attachments)
 
@@ -424,8 +425,9 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
     details: MessageEntity
   ) =
     withContext(Dispatchers.IO) {
-      FlowCryptRoomDatabase.getDatabase(applicationContext).attachmentDao().deleteAttSuspend(
+      roomDatabase.attachmentDao().deleteAttachments(
         account = account.email,
+        accountType = account.accountType,
         label = JavaEmailConstants.FOLDER_OUTBOX,
         uid = details.uid
       )
@@ -459,7 +461,7 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
                 mimeMsg.writeTo(out)
               }
 
-              val threadId = msgEntity.threadId
+              val threadId = msgEntity.threadIdAsHEX
                 ?: mimeMsg.getHeader(JavaEmailConstants.HEADER_IN_REPLY_TO, null)
                   ?.let { replyMsgId ->
                     GmailApiHelper.executeWithResult {
@@ -474,12 +476,63 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
               }
 
               val mediaContent = FileContent(Constants.MIME_TYPE_RFC822, copyOfMimeMsg)
+              gmailMsg = if (msgEntity.draftId.isNullOrEmpty()) {
+                gmail
+                  .users()
+                  .messages()
+                  .send(GmailApiHelper.DEFAULT_USER_ID, gmailMsg, mediaContent)
+                  .execute()
+                  .apply {
+                    setProgress(
+                      workDataOf(
+                        EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE to msgEntity.threadId,
+                      )
+                    )
+                  }
+              } else {
+                try {
+                  gmail
+                    .users()
+                    .drafts()
+                    .send(
+                      GmailApiHelper.DEFAULT_USER_ID,
+                      Draft().apply {
+                        message = gmailMsg
+                        id = msgEntity.draftId
+                      },
+                      mediaContent
+                    ).execute().apply {
+                      setProgress(
+                        workDataOf(
+                          EXTRA_KEY_ID_OF_SENT_DRAFT to msgEntity.draftId,
+                          EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE to msgEntity.threadId,
+                        )
+                      )
+                    }
+                } catch (e: GoogleJsonResponseException) {
+                  val isDraftNotFound = e.details.errors.any {
+                    it.message == "Requested entity was not found."
+                  }
 
-              gmailMsg = gmail
-                .users()
-                .messages()
-                .send(GmailApiHelper.DEFAULT_USER_ID, gmailMsg, mediaContent)
-                .execute()
+                  if (isDraftNotFound) {
+                    //try to send via messages().send()
+                    gmail
+                      .users()
+                      .messages()
+                      .send(GmailApiHelper.DEFAULT_USER_ID, gmailMsg, mediaContent)
+                      .execute()
+                      .apply {
+                        setProgress(
+                          workDataOf(
+                            EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE to msgEntity.threadId,
+                          )
+                        )
+                      }
+                  } else {
+                    throw e
+                  }
+                }
+              }
 
               if (gmailMsg.id == null) {
                 return@withContext false
@@ -557,9 +610,12 @@ class MessagesSenderWorker(context: Context, params: WorkerParameters) :
     }
 
   companion object {
+    const val EXTRA_KEY_ID_OF_SENT_DRAFT = "ID_OF_SENT_DRAFT"
+    const val EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE = "THREAD_ID_OF_SENT_MESSAGE"
+
     private val TAG = MessagesSenderWorker::class.java.simpleName
     private val NOTIFICATION_ID = R.id.notification_id_sending_msgs_worker
-    val NAME = MessagesSenderWorker::class.java.simpleName
+    val NAME: String = MessagesSenderWorker::class.java.simpleName
 
     fun enqueue(context: Context, forceSending: Boolean = false) {
       val constraints = Constraints.Builder()
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/base/BaseMoveMessagesWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/base/BaseMoveMessagesWorker.kt
index a116c2afba..802f659b8c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/base/BaseMoveMessagesWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/base/BaseMoveMessagesWorker.kt
@@ -15,13 +15,13 @@ import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
 import com.flowcrypt.email.jetpack.workmanager.sync.BaseSyncWorker
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Folder
 import jakarta.mail.Message
 import jakarta.mail.Store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 
 /**
  * @author Denys Bondarenko
@@ -51,9 +51,10 @@ abstract class BaseMoveMessagesWorker(context: Context, params: WorkerParameters
     withContext(Dispatchers.IO) {
       val localDestinationFolder = getDestinationFolderForIMAP(account) ?: return@withContext
 
-      moveMessagesInternal(account) { folderName, uidList ->
+      moveMessagesInternal(account) { folderName, entities ->
         store.getFolder(folderName).use { folder ->
           val remoteSrcFolder = (folder as IMAPFolder).apply { open(Folder.READ_WRITE) }
+          val uidList = entities.map { it.uid }
           val msgs: List<Message> =
             remoteSrcFolder.getMessagesByUID(uidList.toLongArray()).filterNotNull()
           val remoteDestFolder = store.getFolder(localDestinationFolder.fullName) as IMAPFolder
@@ -66,16 +67,32 @@ abstract class BaseMoveMessagesWorker(context: Context, params: WorkerParameters
     }
 
   private suspend fun moveMessages(account: AccountEntity) = withContext(Dispatchers.IO) {
-    moveMessagesInternal(account) { folderName, uidList ->
+    moveMessagesInternal(account) { folderName, entities ->
       executeGMailAPICall(applicationContext) {
         val gmailApiLabelsData = getAddAndRemoveLabelIdsForGmailAPI(folderName)
-        GmailApiHelper.changeLabels(
-          context = applicationContext,
-          accountEntity = account,
-          ids = uidList.map { java.lang.Long.toHexString(it).lowercase() },
-          addLabelIds = gmailApiLabelsData.addLabelIds,
-          removeLabelIds = gmailApiLabelsData.removeLabelIds
-        )
+
+        if (account.useConversationMode) {
+          val resultMap = GmailApiHelper.changeLabelsForThreads(
+            context = applicationContext,
+            accountEntity = account,
+            threadIdList = entities.mapNotNull { it.threadIdAsHEX }.toSet(),
+            addLabelIds = gmailApiLabelsData.addLabelIds,
+            removeLabelIds = gmailApiLabelsData.removeLabelIds
+          )
+
+          val successList = resultMap.filter { it.value }.keys
+          val threadMessageEntitiesToBeDeleted = entities.filter { it.threadIdAsHEX in successList }
+          cleanSomeThreadsCache(threadMessageEntitiesToBeDeleted, account)
+        } else {
+          val uidList = entities.map { it.uid }
+          GmailApiHelper.changeLabels(
+            context = applicationContext,
+            accountEntity = account,
+            ids = uidList.map { java.lang.Long.toHexString(it).lowercase() },
+            addLabelIds = gmailApiLabelsData.addLabelIds,
+            removeLabelIds = gmailApiLabelsData.removeLabelIds
+          )
+        }
       }
 
       delay(2000)
@@ -84,7 +101,7 @@ abstract class BaseMoveMessagesWorker(context: Context, params: WorkerParameters
 
   private suspend fun moveMessagesInternal(
     account: AccountEntity,
-    action: suspend (folderName: String, uidList: List<Long>) -> Unit
+    action: suspend (folderName: String, messageEntities: List<MessageEntity>) -> Unit
   ) = withContext(Dispatchers.IO) {
     val roomDatabase = FlowCryptRoomDatabase.getDatabase(applicationContext)
 
@@ -109,8 +126,8 @@ abstract class BaseMoveMessagesWorker(context: Context, params: WorkerParameters
           continue
         }
 
+        action.invoke(srcFolder, filteredMessages)
         val uidList = filteredMessages.map { it.uid }
-        action.invoke(srcFolder, uidList)
         val movedMessages = messagesToMove.filter { it.uid in uidList }
           .map { it.copy(state = MessageState.NONE.value) }
         onMessagesMovedOnServer(account, srcFolder, movedMessages)
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/ArchiveMsgsWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/ArchiveMsgsWorker.kt
index 8f2599b1cf..9aa6b75a75 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/ArchiveMsgsWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/ArchiveMsgsWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -16,15 +16,15 @@ import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Folder
 import jakarta.mail.Message
 import jakarta.mail.Store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 
 /**
- * This task moves marked messages to INBOX folder
+ * This task moves marked messages to Archive folder
  *
  * @author Denys Bondarenko
  */
@@ -39,7 +39,8 @@ class ArchiveMsgsWorker(context: Context, params: WorkerParameters) :
   }
 
   private suspend fun archive(account: AccountEntity, store: Store) = withContext(Dispatchers.IO) {
-    archiveInternal(account) { folderName, uidList ->
+    archiveInternal(account) { folderName, entities ->
+      val uidList = entities.map { it.uid }
       val foldersManager = FoldersManager.fromDatabaseSuspend(applicationContext, account)
       val allMailFolder = foldersManager.folderAll ?: return@archiveInternal
 
@@ -57,21 +58,37 @@ class ArchiveMsgsWorker(context: Context, params: WorkerParameters) :
   }
 
   private suspend fun archive(account: AccountEntity) = withContext(Dispatchers.IO) {
-    archiveInternal(account) { _, uidList ->
+    archiveInternal(account) { _, entities ->
       executeGMailAPICall(applicationContext) {
-        GmailApiHelper.changeLabels(
-          context = applicationContext,
-          accountEntity = account,
-          ids = uidList.map { java.lang.Long.toHexString(it).lowercase() },
-          removeLabelIds = listOf(GmailApiHelper.LABEL_INBOX)
-        )
+        if (account.useConversationMode) {
+          val resultMap = GmailApiHelper.changeLabelsForThreads(
+            context = applicationContext,
+            accountEntity = account,
+            threadIdList = entities.mapNotNull { it.threadIdAsHEX }.toSet(),
+            removeLabelIds = listOf(GmailApiHelper.LABEL_INBOX)
+          )
+
+          val successList = resultMap.filter { it.value }.keys
+          val threadMessageEntitiesToBeDeleted = entities.filter {
+            it.folder == JavaEmailConstants.FOLDER_INBOX && it.threadIdAsHEX in successList
+          }
+          cleanSomeThreadsCache(threadMessageEntitiesToBeDeleted, account)
+        } else {
+          val uidList = entities.map { it.uid }
+          GmailApiHelper.changeLabels(
+            context = applicationContext,
+            accountEntity = account,
+            ids = uidList.map { java.lang.Long.toHexString(it).lowercase() },
+            removeLabelIds = listOf(GmailApiHelper.LABEL_INBOX)
+          )
+        }
       }
     }
   }
 
   private suspend fun archiveInternal(
     account: AccountEntity,
-    action: suspend (folderName: String, list: List<Long>) -> Unit
+    action: suspend (folderName: String, entities: List<MessageEntity>) -> Unit
   ) = withContext(Dispatchers.IO) {
     val roomDatabase = FlowCryptRoomDatabase.getDatabase(applicationContext)
     val foldersManager = FoldersManager.fromDatabaseSuspend(applicationContext, account)
@@ -83,8 +100,7 @@ class ArchiveMsgsWorker(context: Context, params: WorkerParameters) :
       if (candidatesForArchiving.isEmpty()) {
         break
       } else {
-        val uidList = candidatesForArchiving.map { it.uid }
-        action.invoke(inboxFolder.fullName, uidList)
+        action.invoke(inboxFolder.fullName, candidatesForArchiving)
         if (account.isGoogleSignInAccount && account.useAPI) {
           val messageEntitiesToBeDeleted =
             candidatesForArchiving.filter { it.folder == JavaEmailConstants.FOLDER_INBOX }.toSet()
@@ -98,7 +114,10 @@ class ArchiveMsgsWorker(context: Context, params: WorkerParameters) :
             messageEntity.copy(state = MessageState.NONE.value, labelIds = labelIds)
           })
         } else {
-          roomDatabase.msgDao().deleteByUIDsSuspend(account.email, inboxFolder.fullName, uidList)
+          roomDatabase.msgDao().deleteByUIDsSuspend(
+            account.email,
+            inboxFolder.fullName,
+            candidatesForArchiving.map { it.uid })
         }
       }
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseIdleWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseIdleWorker.kt
index 097a4ef23b..585ecdc98d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseIdleWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseIdleWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -11,21 +11,21 @@ import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.extensions.isAppForegrounded
 import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.service.MessagesNotificationManager
-import com.flowcrypt.email.util.GeneralUtil
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Flags
 import jakarta.mail.Message
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 
 /**
  * @author Denys Bondarenko
  */
 abstract class BaseIdleWorker(context: Context, params: WorkerParameters) :
   BaseSyncWorker(context, params) {
-  private val notificationManager = MessagesNotificationManager(applicationContext)
+  protected val notificationManager = MessagesNotificationManager(applicationContext)
 
   protected suspend fun processDeletedMsgs(
     cachedUIDSet: Set<Long>, remoteFolder: IMAPFolder,
@@ -42,8 +42,12 @@ abstract class BaseIdleWorker(context: Context, params: WorkerParameters) :
   ) {
     roomDatabase.msgDao()
       .deleteByUIDsSuspend(accountEntity.email, folderFullName, deleteCandidatesUIDs)
-    if (!GeneralUtil.isAppForegrounded()) {
-      for (uid in deleteCandidatesUIDs) {
+    tryToRemoveNotifications(deleteCandidatesUIDs)
+  }
+
+  protected fun tryToRemoveNotifications(uidList: Collection<Long>) {
+    if (!applicationContext.isAppForegrounded()) {
+      for (uid in uidList) {
         notificationManager.cancel(uid.toHex())
       }
     }
@@ -67,7 +71,11 @@ abstract class BaseIdleWorker(context: Context, params: WorkerParameters) :
   ) {
     roomDatabase.msgDao().updateFlagsSuspend(accountEntity.email, folderFullName, updateCandidates)
 
-    if (!GeneralUtil.isAppForegrounded()) {
+    removeNotificationForSeenMessages(updateCandidates)
+  }
+
+  protected fun removeNotificationForSeenMessages(updateCandidates: Map<Long, Flags>) {
+    if (!applicationContext.isAppForegrounded()) {
       for (item in updateCandidates) {
         val uid = item.key
         if (item.value.contains(Flags.Flag.SEEN)) {
@@ -91,11 +99,12 @@ abstract class BaseIdleWorker(context: Context, params: WorkerParameters) :
 
       val msgEntities = MessageEntity.genMessageEntities(
         context = applicationContext,
-        email = accountEntity.email,
+        account = accountEntity.email,
+        accountType = accountEntity.accountType,
         label = localFolder.fullName,
         folder = remoteFolder,
         msgs = newMsgs,
-        isNew = !GeneralUtil.isAppForegrounded(),
+        isNew = !applicationContext.isAppForegrounded(),
         isOnlyPgpModeEnabled = false,
         hasPgpAfterAdditionalSearchSet = hasPgpAfterAdditionalSearchSet
       )
@@ -111,7 +120,14 @@ abstract class BaseIdleWorker(context: Context, params: WorkerParameters) :
   ) {
     roomDatabase.msgDao().insertWithReplaceSuspend(msgEntities)
 
-    if (!GeneralUtil.isAppForegrounded()) {
+    tryToShowNotificationsForNewMessages(accountEntity, localFolder)
+  }
+
+  protected suspend fun tryToShowNotificationsForNewMessages(
+    accountEntity: AccountEntity,
+    localFolder: LocalFolder
+  ) {
+    if (!applicationContext.isAppForegrounded()) {
       val detailsList =
         roomDatabase.msgDao().getNewMsgsSuspend(accountEntity.email, localFolder.fullName)
       notificationManager.notify(applicationContext, accountEntity, localFolder, detailsList)
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseSyncWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseSyncWorker.kt
index c24460e126..5956826d6d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseSyncWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/BaseSyncWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -13,6 +13,7 @@ import com.flowcrypt.email.api.email.IMAPStoreConnection
 import com.flowcrypt.email.api.email.IMAPStoreManager
 import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.database.entity.MessageEntity
 import com.flowcrypt.email.jetpack.workmanager.BaseWorker
 import com.flowcrypt.email.util.exception.CommonConnectionException
 import jakarta.mail.Store
@@ -81,6 +82,21 @@ abstract class BaseSyncWorker(context: Context, params: WorkerParameters) :
     }
   }
 
+  protected suspend fun cleanSomeThreadsCache(
+    threadMessageEntitiesToBeDeleted: List<MessageEntity>,
+    account: AccountEntity
+  ) = withContext(Dispatchers.IO) {
+    val localFoldersSet = threadMessageEntitiesToBeDeleted.map { it.folder }.toSet()
+    localFoldersSet.forEach { folderName ->
+      val threadIdList = threadMessageEntitiesToBeDeleted.filter { it.folder == folderName }
+        .mapNotNull { it.threadId }
+      if (threadIdList.isNotEmpty()) {
+        roomDatabase.msgDao()
+          .deleteCacheForGmailThreads(account.email, folderName, threadIdList)
+      }
+    }
+  }
+
   companion object {
     const val TAG_SYNC = BuildConfig.APPLICATION_ID + ".SYNC"
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesPermanentlyWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesPermanentlyWorker.kt
index f04ecb008f..e5c091430e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesPermanentlyWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesPermanentlyWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -14,13 +14,15 @@ import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
-import org.eclipse.angus.mail.imap.IMAPFolder
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.extensions.kotlin.toHex
 import jakarta.mail.Flags
 import jakarta.mail.Folder
 import jakarta.mail.Message
 import jakarta.mail.Store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 
 /**
  * @author Denys Bondarenko
@@ -37,32 +39,48 @@ class DeleteMessagesPermanentlyWorker(context: Context, params: WorkerParameters
 
   private suspend fun deleteMsgsPermanently(account: AccountEntity, store: Store) =
     withContext(Dispatchers.IO) {
-      deleteMsgsPermanentlyInternal(account) { folderName, uidList ->
+      deleteMsgsPermanentlyInternal(account) { folderName, entities ->
         store.getFolder(folderName).use { folder ->
           val imapFolder = (folder as IMAPFolder).apply { open(Folder.READ_WRITE) }
+          val uidList = entities.map { it.uid }
           val msgs: List<Message> =
             imapFolder.getMessagesByUID(uidList.toLongArray()).filterNotNull()
           if (msgs.isNotEmpty()) {
             imapFolder.setFlags(msgs.toTypedArray(), Flags(Flags.Flag.DELETED), true)
           }
+          return@deleteMsgsPermanentlyInternal entities
         }
       }
     }
 
   private suspend fun deleteMsgsPermanently(account: AccountEntity) = withContext(Dispatchers.IO) {
-    deleteMsgsPermanentlyInternal(account) { _, uidList ->
+    deleteMsgsPermanentlyInternal(account) { _, entities ->
       executeGMailAPICall(applicationContext) {
-        GmailApiHelper.deleteMsgsPermanently(
-          context = applicationContext,
-          accountEntity = account,
-          ids = uidList.map { java.lang.Long.toHexString(it).lowercase() })
+        if (account.useConversationMode) {
+          val resultMap = GmailApiHelper.deleteThreadsPermanently(
+            context = applicationContext,
+            accountEntity = account,
+            ids = entities.mapNotNull { it.threadIdAsHEX }.toSet()
+          )
+
+          val successList = resultMap.filter { it.value }.keys
+          val threadMessageEntitiesToBeDeleted = entities.filter { it.threadIdAsHEX in successList }
+          cleanSomeThreadsCache(threadMessageEntitiesToBeDeleted, account)
+          return@executeGMailAPICall threadMessageEntitiesToBeDeleted
+        } else {
+          GmailApiHelper.deleteMsgsPermanently(
+            context = applicationContext,
+            accountEntity = account,
+            ids = entities.map { it.uid.toHex() })
+          return@executeGMailAPICall entities
+        }
       }
     }
   }
 
   private suspend fun deleteMsgsPermanentlyInternal(
     account: AccountEntity,
-    action: suspend (folderName: String, list: List<Long>) -> Unit
+    action: suspend (folderName: String, entities: List<MessageEntity>) -> List<MessageEntity>
   ) = withContext(Dispatchers.IO)
   {
     val foldersManager = FoldersManager.fromDatabaseSuspend(applicationContext, account)
@@ -77,9 +95,11 @@ class DeleteMessagesPermanentlyWorker(context: Context, params: WorkerParameters
       if (candidatesForDeleting.isEmpty()) {
         break
       } else {
-        val uidList = candidatesForDeleting.map { it.uid }
-        action.invoke(trash.fullName, uidList)
-        roomDatabase.msgDao().deleteByUIDsSuspend(account.email, trash.fullName, uidList)
+        val candidatesToBeDeletedLocally = action.invoke(trash.fullName, candidatesForDeleting)
+        roomDatabase.msgDao().deleteByUIDsSuspend(
+          account = account.email,
+          label = trash.fullName,
+          msgsUID = candidatesToBeDeletedLocally.map { it.uid })
       }
     }
   }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesWorker.kt
index 3926a34d78..c76721ecbf 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/DeleteMessagesWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -15,14 +15,16 @@ import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
-import org.eclipse.angus.mail.imap.IMAPFolder
-import org.eclipse.angus.mail.imap.IMAPStore
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.extensions.kotlin.toHex
 import jakarta.mail.Folder
 import jakarta.mail.Message
 import jakarta.mail.Store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
+import org.eclipse.angus.mail.imap.IMAPStore
 
 
 /**
@@ -42,28 +44,48 @@ class DeleteMessagesWorker(context: Context, params: WorkerParameters) :
   }
 
   private suspend fun moveMsgsToTrash(account: AccountEntity) = withContext(Dispatchers.IO) {
-    moveMsgsToTrashInternal(account) { _, uidList ->
+    moveMsgsToTrashInternal(account) { _, entities ->
       executeGMailAPICall(applicationContext) {
-        //todo-denbond7 need to improve this logic. We should delete local messages only if we'll
-        // success delete remote messages
-        GmailApiHelper.moveToTrash(
-          context = applicationContext,
-          accountEntity = account,
-          ids = uidList.map { java.lang.Long.toHexString(it).lowercase() })
-        //need to wait while the Gmail server will update labels
-        delay(2000)
+        if (account.useConversationMode) {
+          val resultMap = GmailApiHelper.moveThreadsToTrash(
+            context = applicationContext,
+            accountEntity = account,
+            ids = entities.mapNotNull { it.threadIdAsHEX }.toSet()
+          )
+
+          val successList = resultMap.filter { it.value }.keys
+          val threadMessageEntitiesToBeDeleted = entities.filter { it.threadIdAsHEX in successList }
+          cleanSomeThreadsCache(threadMessageEntitiesToBeDeleted, account)
+          //need to wait while the Gmail server will update labels
+          delay(2000)
+          return@executeGMailAPICall threadMessageEntitiesToBeDeleted
+        } else {
+          val uidList = entities.map { it.uid.toHex().lowercase() }
+          val resultMap = GmailApiHelper.moveToTrash(
+            context = applicationContext,
+            accountEntity = account,
+            ids = uidList
+          )
+          val successList = resultMap.filter { it.value }.keys
+          roomDatabase.msgDao()
+            .deleteSuspend(entities.filter { it.uid.toHex().lowercase() in successList })
+          //need to wait while the Gmail server will update labels
+          delay(2000)
+          return@executeGMailAPICall entities
+        }
       }
     }
   }
 
   private suspend fun moveMsgsToTrash(account: AccountEntity, store: Store) =
     withContext(Dispatchers.IO) {
-      moveMsgsToTrashInternal(account) { folderName, uidList ->
+      moveMsgsToTrashInternal(account) { folderName, entities ->
         store.getFolder(folderName).use { folder ->
           val foldersManager = FoldersManager.fromDatabaseSuspend(applicationContext, account)
           val trash = foldersManager.folderTrash ?: return@use
           val remoteDestFolder = store.getFolder(trash.fullName) as IMAPFolder
           val remoteSrcFolder = (folder as IMAPFolder).apply { open(Folder.READ_WRITE) }
+          val uidList = entities.map { it.uid }
           val msgs: List<Message> =
             remoteSrcFolder.getMessagesByUID(uidList.toLongArray()).filterNotNull()
           if (msgs.isNotEmpty()) {
@@ -74,12 +96,14 @@ class DeleteMessagesWorker(context: Context, params: WorkerParameters) :
             }
           }
         }
+
+        return@moveMsgsToTrashInternal entities
       }
     }
 
   private suspend fun moveMsgsToTrashInternal(
     account: AccountEntity,
-    action: suspend (folderName: String, list: List<Long>) -> Unit
+    action: suspend (folderName: String, entities: List<MessageEntity>) -> List<MessageEntity>
   ) = withContext(Dispatchers.IO)
   {
     val roomDatabase = FlowCryptRoomDatabase.getDatabase(applicationContext)
@@ -103,9 +127,9 @@ class DeleteMessagesWorker(context: Context, params: WorkerParameters) :
           ) {
             continue
           }
-          val uidList = filteredMsgs.map { it.uid }
-          action.invoke(srcFolder, uidList)
-          roomDatabase.msgDao().deleteByUIDsSuspend(account.email, srcFolder, uidList)
+          val candidatesToBeDeletedLocally = action.invoke(srcFolder, filteredMsgs)
+          roomDatabase.msgDao()
+            .deleteByUIDsSuspend(account.email, srcFolder, filteredMsgs.map { it.uid })
         }
       }
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/EmptyTrashWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/EmptyTrashWorker.kt
index 94facd91e3..489a312aaf 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/EmptyTrashWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/EmptyTrashWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -13,13 +13,13 @@ import com.flowcrypt.email.api.email.FoldersManager
 import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Flags
 import jakarta.mail.Folder
 import jakarta.mail.Store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 
 /**
  * @author Denys Bondarenko
@@ -40,12 +40,25 @@ class EmptyTrashWorker(context: Context, params: WorkerParameters) :
         .changeMsgsStateSuspend(account.email, folderName, MessageState.PENDING_EMPTY_TRASH.value)
       try {
         executeGMailAPICall(applicationContext) {
-          val msgs = GmailApiHelper.loadTrashMsgs(applicationContext, account)
-          if (msgs.isNotEmpty()) {
-            GmailApiHelper.deleteMsgsPermanently(applicationContext, account, msgs.map { it.id })
-            //need to wait while the Gmail server will update labels
-            delay(2000)
+          val messages = GmailApiHelper.loadTrashMsgs(applicationContext, account)
+          if (messages.isEmpty()) {
+            return@executeGMailAPICall
+          }
+
+          if (account.useConversationMode) {
+            GmailApiHelper.deleteThreadsPermanently(
+              applicationContext,
+              account,
+              messages.mapNotNull { it.threadId }.toSet()
+            )
+          } else {
+            GmailApiHelper.deleteMsgsPermanently(
+              applicationContext,
+              account,
+              messages.map { it.id })
           }
+          //need to wait while the Gmail server will update labels
+          delay(2000)
         }
       } catch (e: Exception) {
         roomDatabase.msgDao().changeMsgsStateSuspend(account.email, folderName)
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleSyncWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleSyncWorker.kt
index 68234938d2..00c2ea318f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleSyncWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleSyncWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -12,20 +12,16 @@ import com.flowcrypt.email.BuildConfig
 import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.FoldersManager
 import com.flowcrypt.email.api.email.gmail.GmailApiHelper
-import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.api.email.gmail.GmailHistoryHandler
 import com.flowcrypt.email.database.entity.AccountEntity
-import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.com.google.api.services.gmail.model.hasPgp
-import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.exception.GmailAPIException
-import com.google.api.services.gmail.model.History
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.FetchProfile
 import jakarta.mail.Folder
 import jakarta.mail.Store
 import jakarta.mail.UIDFolder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 import java.math.BigInteger
 import java.net.HttpURLConnection
 
@@ -114,7 +110,7 @@ open class InboxIdleSyncWorker(context: Context, params: WorkerParameters) :
     val foldersManager = FoldersManager.fromDatabaseSuspend(applicationContext, accountEntity)
     val inboxLocalFolder = foldersManager.findInboxFolder() ?: return@withContext
     val newestMsg =
-      roomDatabase.msgDao().getNewestMsg(account = accountEntity.email, inboxLocalFolder.fullName)
+      roomDatabase.msgDao().getNewestMsgOrThread(accountEntity, inboxLocalFolder.fullName)
     val labelEntity = roomDatabase.labelDao()
       .getLabelSuspend(accountEntity.email, accountEntity.accountType, inboxLocalFolder.fullName)
     val labelEntityHistoryId = BigInteger(labelEntity?.historyId ?: "0")
@@ -131,7 +127,16 @@ open class InboxIdleSyncWorker(context: Context, params: WorkerParameters) :
             historyId = labelEntityHistoryId.max(msgEntityHistoryId)
           )
 
-          handleMsgsFromHistory(accountEntity, inboxLocalFolder, historyList)
+          GmailHistoryHandler.handleHistory(
+            applicationContext,
+            accountEntity,
+            inboxLocalFolder,
+            historyList
+          ) { deleteCandidatesUIDs, _, updateCandidatesMap, _ ->
+            tryToRemoveNotifications(deleteCandidatesUIDs.keys)
+            tryToShowNotificationsForNewMessages(accountEntity, inboxLocalFolder)
+            removeNotificationForSeenMessages(updateCandidatesMap.mapValues { it.value.second })
+          }
         } catch (e: Exception) {
           if (e is GmailAPIException && e.code == HttpURLConnection.HTTP_NOT_FOUND) {
             /*
@@ -153,57 +158,6 @@ open class InboxIdleSyncWorker(context: Context, params: WorkerParameters) :
     }
   }
 
-  private suspend fun handleMsgsFromHistory(
-    accountEntity: AccountEntity, localFolder: LocalFolder,
-    historyList: List<History>
-  ) = withContext(Dispatchers.IO) {
-    GmailApiHelper.processHistory(localFolder, historyList) { deleteCandidatesUIDs,
-                                                              newCandidatesMap,
-                                                              updateCandidatesMap,
-                                                              labelsToBeUpdatedMap ->
-      val email = accountEntity.email
-      processDeletedMsgs(accountEntity, localFolder.fullName, deleteCandidatesUIDs)
-
-      val newCandidates = newCandidatesMap.values.toList()
-      if (newCandidates.isNotEmpty()) {
-        val msgs = GmailApiHelper.loadMsgsInParallel(
-          applicationContext, accountEntity,
-          newCandidates, localFolder
-        ).run {
-          if (accountEntity.showOnlyEncrypted == true) {
-            filter { it.hasPgp() }
-          } else this
-        }
-
-        val isOnlyPgpModeEnabled = accountEntity.showOnlyEncrypted ?: false
-        val isNew = !GeneralUtil.isAppForegrounded()
-
-        val msgEntities = MessageEntity.genMessageEntities(
-          context = applicationContext,
-          email = email,
-          label = localFolder.fullName,
-          msgsList = msgs,
-          isNew = isNew,
-          onlyPgpModeEnabled = isOnlyPgpModeEnabled
-        )
-
-        processNewMsgs(accountEntity, localFolder, msgEntities)
-        GmailApiHelper.identifyAttachments(
-          msgEntities,
-          msgs,
-          accountEntity,
-          localFolder,
-          roomDatabase
-        )
-      }
-
-      processUpdatedMsgs(accountEntity, localFolder.fullName, updateCandidatesMap)
-
-      roomDatabase.msgDao()
-        .updateGmailLabels(accountEntity.email, localFolder.fullName, labelsToBeUpdatedMap)
-    }
-  }
-
   companion object {
     const val GROUP_UNIQUE_TAG = BuildConfig.APPLICATION_ID + ".IDLE_SYNC_INBOX"
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/SyncDraftsWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/SyncDraftsWorker.kt
index b038099324..780057dabe 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/SyncDraftsWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/SyncDraftsWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -19,6 +19,7 @@ import jakarta.mail.Store
 /**
  * @author Denys Bondarenko
  */
+//need to think about this one
 class SyncDraftsWorker(context: Context, params: WorkerParameters) :
   BaseSyncWorker(context, params) {
   override fun useIndependentConnection(): Boolean = true
@@ -28,6 +29,10 @@ class SyncDraftsWorker(context: Context, params: WorkerParameters) :
   }
 
   override suspend fun runAPIAction(accountEntity: AccountEntity) {
+    if (accountEntity.useConversationMode) {
+      return
+    }
+
     val foldersManager = FoldersManager.fromDatabaseSuspend(applicationContext, accountEntity)
     val folderDrafts = foldersManager.folderDrafts ?: return
     val existingSyncedDrafts = roomDatabase.msgDao().getMsgsSuspend(
@@ -62,7 +67,8 @@ class SyncDraftsWorker(context: Context, params: WorkerParameters) :
 
       val msgEntities = MessageEntity.genMessageEntities(
         context = applicationContext,
-        email = accountEntity.email,
+        account = accountEntity.email,
+        accountType = accountEntity.accountType,
         label = folderDrafts.fullName,
         msgsList = msgs,
         isNew = false,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UpdateMsgsSeenStateWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UpdateMsgsSeenStateWorker.kt
index e19462cff4..db033d6d97 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UpdateMsgsSeenStateWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UpdateMsgsSeenStateWorker.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.jetpack.workmanager.sync
@@ -13,13 +13,14 @@ import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
-import org.eclipse.angus.mail.imap.IMAPFolder
+import com.flowcrypt.email.database.entity.MessageEntity
 import jakarta.mail.Flags
 import jakarta.mail.Folder
 import jakarta.mail.Message
 import jakarta.mail.Store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 
 /**
  * This task mark candidates as read/unread.
@@ -43,9 +44,10 @@ class UpdateMsgsSeenStateWorker(context: Context, params: WorkerParameters) :
     store: Store,
     state: MessageState
   ) = withContext(Dispatchers.IO) {
-    changeMsgsReadStateInternal(account, state) { fullFolderName, uidList ->
+    changeMsgsReadStateInternal(account, state) { fullFolderName, entities ->
       store.getFolder(fullFolderName).use { folder ->
         val imapFolder = (folder as IMAPFolder).apply { open(Folder.READ_WRITE) }
+        val uidList = entities.map { it.uid }
         val msgs: List<Message> = imapFolder.getMessagesByUID(uidList.toLongArray()).filterNotNull()
         if (msgs.isNotEmpty()) {
           imapFolder.setFlags(
@@ -60,21 +62,31 @@ class UpdateMsgsSeenStateWorker(context: Context, params: WorkerParameters) :
 
   private suspend fun changeMsgsReadState(account: AccountEntity, state: MessageState) =
     withContext(Dispatchers.IO) {
-      changeMsgsReadStateInternal(account, state) { _, uidList ->
+      changeMsgsReadStateInternal(account, state) { _, entities ->
         executeGMailAPICall(applicationContext) {
-          if (state == MessageState.PENDING_MARK_READ) {
-            GmailApiHelper.changeLabels(
+          val removeLabelIds = if (state == MessageState.PENDING_MARK_READ) {
+            listOf(GmailApiHelper.LABEL_UNREAD)
+          } else null
+
+          val addLabelIds = if (state == MessageState.PENDING_MARK_READ) {
+            null
+          } else listOf(GmailApiHelper.LABEL_UNREAD)
+
+          if (account.useConversationMode) {
+            GmailApiHelper.changeLabelsForThreads(
               context = applicationContext,
               accountEntity = account,
-              ids = uidList.map { java.lang.Long.toHexString(it).lowercase() },
-              removeLabelIds = listOf(GmailApiHelper.LABEL_UNREAD)
+              threadIdList = entities.mapNotNull { it.threadIdAsHEX }.toSet(),
+              removeLabelIds = removeLabelIds,
+              addLabelIds = addLabelIds
             )
           } else {
             GmailApiHelper.changeLabels(
               context = applicationContext,
               accountEntity = account,
-              ids = uidList.map { java.lang.Long.toHexString(it).lowercase() },
-              addLabelIds = listOf(GmailApiHelper.LABEL_UNREAD)
+              ids = entities.map { java.lang.Long.toHexString(it.uid).lowercase() },
+              removeLabelIds = removeLabelIds,
+              addLabelIds = addLabelIds
             )
           }
         }
@@ -84,7 +96,7 @@ class UpdateMsgsSeenStateWorker(context: Context, params: WorkerParameters) :
   private suspend fun changeMsgsReadStateInternal(
     account: AccountEntity,
     state: MessageState,
-    action: suspend (folderName: String, list: List<Long>) -> Unit
+    action: suspend (folderName: String, entities: List<MessageEntity>) -> Unit
   ) = withContext(Dispatchers.IO) {
     val roomDatabase = FlowCryptRoomDatabase.getDatabase(applicationContext)
     val candidatesForMark =
@@ -100,8 +112,8 @@ class UpdateMsgsSeenStateWorker(context: Context, params: WorkerParameters) :
           continue
         }
 
+        action.invoke(folderName, filteredMsgs)
         val uidList = filteredMsgs.map { it.uid }
-        action.invoke(folderName, uidList)
         val entities = roomDatabase.msgDao().getMsgsByUIDs(account.email, folderName, uidList)
           .filter { it.msgState == state }
           .map { it.copy(state = MessageState.NONE.value) }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UploadDraftsWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UploadDraftsWorker.kt
index f8403143cc..8790fad7c4 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UploadDraftsWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/UploadDraftsWorker.kt
@@ -8,11 +8,13 @@ package com.flowcrypt.email.jetpack.workmanager.sync
 import android.content.Context
 import androidx.work.ExistingWorkPolicy
 import androidx.work.WorkerParameters
+import androidx.work.workDataOf
 import com.flowcrypt.email.BuildConfig
 import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.extensions.threadIdAsLong
 import com.flowcrypt.email.extensions.uid
 import com.flowcrypt.email.security.KeyStoreCryptoManager
 import com.flowcrypt.email.util.CacheManager
@@ -30,6 +32,9 @@ import java.io.File
 import java.io.FileFilter
 import java.util.Properties
 
+/**
+ * @author Denys Bondarenko
+ */
 class UploadDraftsWorker(context: Context, params: WorkerParameters) :
   BaseSyncWorker(context, params) {
   override suspend fun runIMAPAction(accountEntity: AccountEntity, store: Store) {
@@ -66,7 +71,7 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
           account = account,
           mimeMessage = mimeMessage,
           draftId = draftId,
-          threadId = messageEntity.threadId
+          threadId = messageEntity.threadIdAsHEX
         )
 
         val message = GmailApiHelper.loadMsgInfoSuspend(
@@ -78,7 +83,7 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
             "threadId",
             "historyId"
           ),
-          format = GmailApiHelper.MESSAGE_RESPONSE_FORMAT_FULL
+          format = GmailApiHelper.RESPONSE_FORMAT_FULL
         )
 
         val freshestMessageEntity =
@@ -86,7 +91,7 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
 
         val messageEntityWithoutStateChange = messageEntity.copy(
           uid = message.uid,
-          threadId = message.threadId,
+          threadId = message.threadIdAsLong,
           draftId = draft.id,
           historyId = message.historyId.toString()
         )
@@ -108,6 +113,7 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
     val draftsDir = CacheManager.getDraftDirectory(applicationContext)
     val directories = draftsDir.listFiles(FileFilter { it.isDirectory }) ?: emptyArray()
     var attemptsCount = 0
+    val setOfThreadToBeAffected = mutableSetOf<Long>()
     while (attemptsCount < MAX_ATTEMPTS_COUNT && FileUtils.listFiles(
         draftsDir,
         TrueFileFilter.INSTANCE,
@@ -117,12 +123,31 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
       for (directory in directories) {
         val directoryName = directory.name
         val existingDraftEntity = roomDatabase.msgDao().getMsgById(directoryName.toLong())
+
         if (existingDraftEntity == null) {
           FileAndDirectoryUtils.deleteDir(directory)
           continue
         }
+
+        val activeAccount = roomDatabase.accountDao().getActiveAccountSuspend()
+        if (activeAccount != null) {
+          val outgoingMessages = roomDatabase.msgDao().getOutboxMsgsSuspend(activeAccount.email)
+          if (outgoingMessages.any { it.uid == existingDraftEntity.uid }) {
+            //it looks like a user sent a message for this draft
+            FileAndDirectoryUtils.deleteDir(directory)
+            continue
+          }
+        }
+
         val drafts = directory.listFiles(FileFilter { it.isFile }) ?: emptyArray()
         try {
+          setProgress(
+            workDataOf(
+              EXTRA_KEY_MESSAGE_UID to existingDraftEntity.uid,
+              EXTRA_KEY_THREAD_ID to existingDraftEntity.threadId,
+              EXTRA_KEY_STATE to STATE_UPLOADING
+            )
+          )
           val lastVersion = drafts.maxBy { it.lastModified() }
           val inputStream = KeyStoreCryptoManager.getCipherInputStream(lastVersion.inputStream())
           val mimeMessage = MimeMessage(Session.getInstance(Properties()), inputStream)
@@ -155,14 +180,40 @@ class UploadDraftsWorker(context: Context, params: WorkerParameters) :
           }
 
           continue
+        } finally {
+          setProgress(
+            workDataOf(
+              EXTRA_KEY_MESSAGE_UID to existingDraftEntity.uid,
+              EXTRA_KEY_THREAD_ID to existingDraftEntity.threadId,
+              EXTRA_KEY_STATE to STATE_UPLOAD_COMPLETED
+            )
+          )
+
+          existingDraftEntity.threadId?.let { setOfThreadToBeAffected.add(it) }
         }
       }
 
       attemptsCount++
     }
+
+    setProgress(
+      workDataOf(
+        EXTRA_KEY_STATE to STATE_COMMON_UPLOAD_COMPLETED,
+        EXTRA_KEY_THREAD_ID_LIST to setOfThreadToBeAffected.toTypedArray(),
+      )
+    )
   }
 
   companion object {
+    const val EXTRA_KEY_MESSAGE_UID = "MESSAGE_UID"
+    const val EXTRA_KEY_THREAD_ID = "THREAD_ID"
+    const val EXTRA_KEY_THREAD_ID_LIST = "THREAD_ID_LIST"
+    const val EXTRA_KEY_STATE = "STATE"
+
+    const val STATE_UPLOADING = 0
+    const val STATE_UPLOAD_COMPLETED = 1
+    const val STATE_COMMON_UPLOAD_COMPLETED = 2
+
     const val GROUP_UNIQUE_TAG = BuildConfig.APPLICATION_ID + ".UPLOAD_DRAFTS"
     const val MAX_ATTEMPTS_COUNT = 10
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageAction.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageAction.kt
new file mode 100644
index 0000000000..82a7c5f5cd
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageAction.kt
@@ -0,0 +1,19 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.model
+
+/**
+ * @author Denys Bondarenko
+ */
+enum class MessageAction {
+  DELETE,
+  ARCHIVE,
+  MOVE_TO_INBOX,
+  MOVE_TO_SPAM,
+  MARK_AS_NOT_SPAM,
+  CHANGE_LABELS,
+  MARK_UNREAD
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/providers/EmbeddedAttachmentsProvider.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/providers/EmbeddedAttachmentsProvider.kt
index 5a079accee..50389a5ed2 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/providers/EmbeddedAttachmentsProvider.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/providers/EmbeddedAttachmentsProvider.kt
@@ -12,14 +12,16 @@ import android.os.CancellationSignal
 import android.os.ParcelFileDescriptor
 import android.provider.DocumentsContract
 import android.provider.DocumentsProvider
+import androidx.collection.LruCache
 import com.flowcrypt.email.BuildConfig
 import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.extensions.java.lang.printStackTraceIfDebugOnly
+import org.apache.commons.io.FileUtils
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.io.OutputStream
 import java.util.UUID
-import java.util.concurrent.ConcurrentHashMap
+import kotlin.math.max
 
 /**
  * @author Denys Bondarenko
@@ -97,21 +99,31 @@ class EmbeddedAttachmentsProvider : DocumentsProvider() {
 
 
   class Cache private constructor() {
-    private val map: ConcurrentHashMap<String, AttachmentInfo> = ConcurrentHashMap()
+    private val lruCache: LruCache<String, AttachmentInfo>
+
+    init {
+      val maxMemory = Runtime.getRuntime().maxMemory()
+      val cacheSize = max(maxMemory / 4, FileUtils.ONE_MB * 25).toInt()
+      lruCache = object : LruCache<String, AttachmentInfo>(cacheSize) {
+        override fun sizeOf(key: String, attachmentInfo: AttachmentInfo): Int {
+          return attachmentInfo.rawData?.size ?: attachmentInfo.encodedSize.toInt()
+        }
+      }
+    }
 
     fun get(documentId: String): AttachmentInfo? {
-      return map[documentId]
+      return lruCache.get(documentId)
     }
 
     fun getUriVersion(documentId: String): AttachmentInfo? {
-      return map[documentId]?.copy(
+      return lruCache.get(documentId)?.copy(
         rawData = null,
         uri = getUriByDocumentId(documentId)
       )
     }
 
     fun getDocumentId(attachmentInfo: AttachmentInfo): String? {
-      return map.filter { entry ->
+      return lruCache.snapshot().filter { entry ->
         entry.value.uniqueStringId == attachmentInfo.uniqueStringId
             && entry.value.name == attachmentInfo.name
       }.map { it.key }.firstOrNull()
@@ -123,7 +135,7 @@ class EmbeddedAttachmentsProvider : DocumentsProvider() {
     }
 
     fun clear() {
-      map.clear()
+      lruCache.evictAll()
     }
 
     private fun addOrReplace(attachmentInfo: AttachmentInfo): Uri? {
@@ -131,11 +143,11 @@ class EmbeddedAttachmentsProvider : DocumentsProvider() {
 
       return if (attachmentInfo.rawData != null) {
         val documentId = existingAttachmentInfoKey ?: UUID.randomUUID().toString()
-        map[documentId] = attachmentInfo
+        lruCache.put(documentId, attachmentInfo)
         getUriByDocumentId(documentId)
       } else {
         if (existingAttachmentInfoKey != null) {
-          map.remove(existingAttachmentInfoKey)
+          lruCache.remove(existingAttachmentInfoKey)
         }
         null
       }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt
index 1f4d6a9d51..46242b3897 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt
@@ -16,6 +16,7 @@ import com.flowcrypt.email.api.retrofit.response.model.DecryptedAttMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.EncryptedAttLinkMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.EncryptedSubjectBlock
 import com.flowcrypt.email.api.retrofit.response.model.GenericMsgBlock
+import com.flowcrypt.email.api.retrofit.response.model.InlineAttMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.MsgBlockError
 import com.flowcrypt.email.api.retrofit.response.model.MsgBlockFactory
@@ -188,8 +189,11 @@ object PgpMsg {
     .allowAttributesOnElementsExt(ALLOWED_ATTRS)
     .toFactory()
 
-  suspend fun processMimeMessage(context: Context, inputStream: InputStream):
-      ProcessedMimeMessageResult = withContext(Dispatchers.IO) {
+  suspend fun processMimeMessage(
+    context: Context,
+    inputStream: InputStream,
+    skipAttachmentsRawData: Boolean = false
+  ): ProcessedMimeMessageResult = withContext(Dispatchers.IO) {
     val keysStorage = KeysStorageImpl.getInstance(context)
     val accountSecretKeys = PGPSecretKeyRingCollection(keysStorage.getPGPSecretKeyRings())
     val protector = keysStorage.getSecretKeyRingProtector()
@@ -215,7 +219,8 @@ object PgpMsg {
       msg = msg,
       verificationPublicKeys = PGPPublicKeyRingCollection(verificationPublicKeys),
       secretKeys = accountSecretKeys,
-      protector = protector
+      protector = protector,
+      skipAttachmentsRawData = skipAttachmentsRawData
     )
   }
 
@@ -235,7 +240,8 @@ object PgpMsg {
     msg: MimeMessage,
     verificationPublicKeys: PGPPublicKeyRingCollection = PGPPublicKeyRingCollection(listOf()),
     secretKeys: PGPSecretKeyRingCollection,
-    protector: SecretKeyRingProtector
+    protector: SecretKeyRingProtector,
+    skipAttachmentsRawData: Boolean = false
   ): ProcessedMimeMessageResult {
     val extractedMsgBlocks = extractMsgBlocksFromPart(
       part = msg,
@@ -243,7 +249,10 @@ object PgpMsg {
       secretKeys = secretKeys,
       protector = protector
     )
-    return processExtractedMsgBlocks(extractedMsgBlocks)
+    return processExtractedMsgBlocks(
+      msgBlocks = extractedMsgBlocks,
+      skipAttachmentsRawData = skipAttachmentsRawData
+    )
   }
 
   fun extractMsgBlocksFromPart(
@@ -779,7 +788,10 @@ object PgpMsg {
     return decryptedContent
   }
 
-  private fun processExtractedMsgBlocks(msgBlocks: Collection<MsgBlock>): ProcessedMimeMessageResult {
+  private fun processExtractedMsgBlocks(
+    msgBlocks: Collection<MsgBlock>,
+    skipAttachmentsRawData: Boolean = false
+  ): ProcessedMimeMessageResult {
     var isEncrypted = false
     val contentBlocks = mutableListOf<MsgBlock>()
     val resultBlocks = mutableListOf<MsgBlock>()
@@ -881,7 +893,23 @@ object PgpMsg {
 
     return ProcessedMimeMessageResult(
       text = fmtRes.text,
-      blocks = resultBlocks,
+      blocks = if (skipAttachmentsRawData) {
+        resultBlocks.map {
+          when (it) {
+            is DecryptedAttMsgBlock -> {
+              it.copy(attMeta = it.attMeta.copy(data = null))
+            }
+
+            is InlineAttMsgBlock -> {
+              it.copy(attMeta = it.attMeta.copy(data = null))
+            }
+
+            else -> it
+          }
+        }
+      } else {
+        resultBlocks
+      },
       verificationResult = VerificationResult(
         hasEncryptedParts = isEncrypted,
         hasSignedParts = signedBlockCount > 0,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt
index 510717e1d7..c8c8e4b6ae 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.service
@@ -19,21 +19,21 @@ import androidx.lifecycle.switchMap
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.extensions.isAppForegrounded
 import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.jetpack.lifecycle.ConnectionLifecycleObserver
 import com.flowcrypt.email.jetpack.workmanager.sync.InboxIdleMsgsAddedWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.InboxIdleMsgsRemovedWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.InboxIdleSyncWorker
-import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.LogsUtil
 import com.flowcrypt.email.util.exception.ExceptionUtil
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Flags
 import jakarta.mail.event.MessageChangedEvent
 import jakarta.mail.event.MessageCountEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.eclipse.angus.mail.imap.IMAPFolder
 import java.util.concurrent.Executors
 import java.util.concurrent.Future
 import java.util.concurrent.ThreadPoolExecutor
@@ -186,7 +186,7 @@ class IdleService : LifecycleService() {
           msg.flags
         )
 
-        if (!GeneralUtil.isAppForegrounded()) {
+        if (!applicationContext.isAppForegrounded()) {
           if (msg.flags.contains(Flags.Flag.SEEN)) {
             MessagesNotificationManager(applicationContext).cancel(remoteFolder.getUID(msg).toHex())
           }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/MessagesNotificationManager.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/MessagesNotificationManager.kt
index ea91493244..84f4775ec3 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/MessagesNotificationManager.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/MessagesNotificationManager.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.service
@@ -28,12 +28,12 @@ import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
 import com.flowcrypt.email.ui.activity.MainActivity
 import com.flowcrypt.email.ui.activity.fragment.MessageDetailsFragmentArgs
+import com.flowcrypt.email.ui.activity.fragment.ThreadDetailsFragmentArgs
 import com.flowcrypt.email.ui.activity.fragment.preferences.NotificationsSettingsFragment
 import com.flowcrypt.email.ui.notifications.CustomNotificationManager
 import com.flowcrypt.email.ui.notifications.NotificationChannelManager
 import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.SharedPreferencesHelper
-import com.google.android.gms.common.util.CollectionUtils
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -115,10 +115,8 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
       }
 
       val builder = NotificationCompat.Builder(
-        context, NotificationChannelManager
-          .CHANNEL_ID_MESSAGES
-      )
-        .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
+        context, NotificationChannelManager.CHANNEL_ID_MESSAGES
+      ).setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
         .setPriority(NotificationCompat.PRIORITY_DEFAULT)
         .setCategory(NotificationCompat.CATEGORY_EMAIL)
         .setSmallIcon(R.drawable.ic_email_encrypted)
@@ -133,11 +131,11 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
         )
         .setDeleteIntent(
           genDeletePendingIntent(
-            context,
-            msg.uid.toInt(),
-            account,
-            localFolder,
-            msg
+            context = context,
+            requestCode = msg.uid.toInt(),
+            account = account,
+            localFolder = localFolder,
+            msgs = listOf(msg)
           )
         )
         .setAutoCancel(true)
@@ -145,7 +143,15 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
         .setStyle(NotificationCompat.BigTextStyle().bigText(msg.subject))
         .setGroup(GROUP_NAME_FLOWCRYPT_MESSAGES)
         .setContentText(msg.subject)
-        .setContentIntent(getMsgDetailsPendingIntent(context, msg.uid.toInt(), localFolder, msg))
+        .setContentIntent(
+          getMsgDetailsPendingIntent(
+            context = context,
+            accountEntity = account,
+            requestCode = msg.uid.toInt(),
+            localFolder = localFolder,
+            messageEntity = msg
+          )
+        )
         .setDefaults(Notification.DEFAULT_ALL)
         .setSubText(account.email)
 
@@ -203,8 +209,11 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
         .setContentIntent(getInboxPendingIntent(context))
         .setDeleteIntent(
           genDeletePendingIntent(
-            context, NOTIFICATIONS_GROUP_MESSAGES,
-            account, localFolder, msgs
+            context = context,
+            requestCode = NOTIFICATIONS_GROUP_MESSAGES,
+            account = account,
+            localFolder = localFolder,
+            msgs = msgs
           )
         )
         .setDefaults(Notification.DEFAULT_ALL)
@@ -225,18 +234,10 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
   }
 
   private fun genDeletePendingIntent(
-    context: Context, requestCode: Int,
-    account: AccountEntity, localFolder: LocalFolder,
-    messageEntity: MessageEntity
-  ): PendingIntent {
-    val msgs = ArrayList<MessageEntity>()
-    msgs.add(messageEntity)
-    return genDeletePendingIntent(context, requestCode, account, localFolder, msgs)
-  }
-
-  private fun genDeletePendingIntent(
-    context: Context, requestCode: Int,
-    account: AccountEntity, localFolder: LocalFolder,
+    context: Context,
+    requestCode: Int,
+    account: AccountEntity,
+    localFolder: LocalFolder,
     msgs: List<MessageEntity>
   ): PendingIntent {
     val intent = Intent(context, MarkMessagesAsOldBroadcastReceiver::class.java)
@@ -244,12 +245,11 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
     intent.putExtra(MarkMessagesAsOldBroadcastReceiver.EXTRA_KEY_EMAIL, account.email)
     intent.putExtra(MarkMessagesAsOldBroadcastReceiver.EXTRA_KEY_LABEL, localFolder.fullName)
 
-    if (!CollectionUtils.isEmpty(msgs)) {
-      val uidList = ArrayList<String>()
-      for (msg in msgs) {
-        uidList.add(msg.uid.toString())
-      }
-      intent.putStringArrayListExtra(MarkMessagesAsOldBroadcastReceiver.EXTRA_KEY_UID_LIST, uidList)
+    if (msgs.isNotEmpty()) {
+      intent.putStringArrayListExtra(
+        MarkMessagesAsOldBroadcastReceiver.EXTRA_KEY_UID_LIST,
+        ArrayList(msgs.map { it.uid.toString() })
+      )
     }
 
     return PendingIntent.getBroadcast(
@@ -269,11 +269,31 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
   }
 
   private fun getMsgDetailsPendingIntent(
-    context: Context, requestCode: Int, localFolder: LocalFolder, messageEntity: MessageEntity
+    context: Context,
+    accountEntity: AccountEntity,
+    requestCode: Int,
+    localFolder: LocalFolder,
+    messageEntity: MessageEntity
   ): PendingIntent {
-    return requireNotNull(
-      NavDeepLinkBuilder(context)
-        .setGraph(R.navigation.nav_graph)
+    val navDeepLinkBuilder = NavDeepLinkBuilder(context)
+      .setGraph(R.navigation.nav_graph)
+      .setComponentName(MainActivity::class.java)
+
+    if (accountEntity.isGoogleSignInAccount
+      && accountEntity.useAPI
+      && accountEntity.useConversationMode
+      && messageEntity.id != null
+    ) {
+      navDeepLinkBuilder
+        .setDestination(R.id.threadDetailsFragment)
+        .setArguments(
+          ThreadDetailsFragmentArgs(
+            messageEntityId = messageEntity.id,
+            localFolder = localFolder
+          ).toBundle()
+        )
+    } else {
+      navDeepLinkBuilder
         .setDestination(R.id.messageDetailsFragment)
         .setArguments(
           MessageDetailsFragmentArgs(
@@ -281,7 +301,10 @@ class MessagesNotificationManager(context: Context) : CustomNotificationManager(
             localFolder = localFolder
           ).toBundle()
         )
-        .setComponentName(MainActivity::class.java)
+    }
+
+    return requireNotNull(
+      navDeepLinkBuilder
         .createTaskStackBuilder()
         .getPendingIntent(
           requestCode, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/ProcessingOutgoingMessageInfoHelper.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/ProcessingOutgoingMessageInfoHelper.kt
index 808655315e..afe1ab8776 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/ProcessingOutgoingMessageInfoHelper.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/ProcessingOutgoingMessageInfoHelper.kt
@@ -14,6 +14,7 @@ import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.email.model.OutgoingMessageInfo
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.dao.BaseDao
+import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.AttachmentEntity
 import com.flowcrypt.email.database.entity.MessageEntity
 import com.flowcrypt.email.database.entity.RecipientEntity
@@ -73,7 +74,12 @@ object ProcessingOutgoingMessageInfoHelper {
         }
       }
 
-      addAttsToCache(context, outgoingMsgInfo, msgAttsCacheDir)
+      addAttsToCache(
+        context = context,
+        accountEntity = accountEntity,
+        outgoingMsgInfo = outgoingMsgInfo,
+        attsCacheDir = msgAttsCacheDir
+      )
     }
 
     afterMimeMessageCreatingAction.invoke(mimeMessage)
@@ -91,6 +97,7 @@ object ProcessingOutgoingMessageInfoHelper {
 
   private fun addAttsToCache(
     context: Context,
+    accountEntity: AccountEntity,
     outgoingMsgInfo: OutgoingMessageInfo,
     attsCacheDir: File
   ) {
@@ -178,7 +185,9 @@ object ProcessingOutgoingMessageInfoHelper {
       }
     }
 
-    roomDatabase.attachmentDao().insert(cachedAtts.mapNotNull { AttachmentEntity.fromAttInfo(it) })
+    roomDatabase.attachmentDao().insert(cachedAtts.mapNotNull {
+      AttachmentEntity.fromAttInfo(attachmentInfo = it, accountType = accountEntity.accountType)
+    })
   }
 
   /**
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
index 3405f4ee9e..b0604ede18 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.service.attachment
@@ -21,7 +21,6 @@ import android.os.Messenger
 import android.os.RemoteException
 import android.provider.MediaStore
 import android.text.TextUtils
-import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.core.content.FileProvider
@@ -36,6 +35,7 @@ import com.flowcrypt.email.api.email.protocol.OpenStoreHelper
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.extensions.android.content.getParcelableExtraViaExt
+import com.flowcrypt.email.extensions.kotlin.getPossibleAndroidMimeType
 import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.security.KeysStorageImpl
 import com.flowcrypt.email.security.SecurityUtils
@@ -45,7 +45,6 @@ import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.LogsUtil
 import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.google.android.gms.common.util.CollectionUtils
-import org.eclipse.angus.mail.imap.IMAPFolder
 import jakarta.mail.Folder
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -56,6 +55,7 @@ import org.apache.commons.io.FileUtils
 import org.apache.commons.io.FilenameUtils
 import org.apache.commons.io.IOUtils
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection
+import org.eclipse.angus.mail.imap.IMAPFolder
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -512,7 +512,10 @@ class AttachmentDownloadManagerService : LifecycleService() {
             if (!Thread.currentThread().isInterrupted) {
               val uri = storeFileToSharedFolder(context, attTempFile)
               listener?.onAttDownloaded(
-                attInfo = att.copy(name = finalFileName),
+                attInfo = att.copy(
+                  name = finalFileName,
+                  type = finalFileName.getPossibleAndroidMimeType() ?: att.type
+                ),
                 uri = uri,
                 useContentApp = account.isHandlingAttachmentRestricted()
               )
@@ -529,7 +532,7 @@ class AttachmentDownloadManagerService : LifecycleService() {
                 context = context,
                 accountEntity = account,
                 msgId = att.uid.toHex(),
-                format = GmailApiHelper.MESSAGE_RESPONSE_FORMAT_FULL
+                format = GmailApiHelper.RESPONSE_FORMAT_FULL
               )
               val attPart = GmailApiHelper.getAttPartByPath(msg.payload, neededPath = att.path)
                 ?: throw IllegalStateException(context.getString(R.string.attachment_not_found))
@@ -599,7 +602,12 @@ class AttachmentDownloadManagerService : LifecycleService() {
         } else {
           val uri = storeFileToSharedFolder(context, attTempFile)
           listener?.onAttDownloaded(
-            attInfo = att.copy(name = finalFileName),
+            attInfo = att.copy(
+              name = finalFileName,
+              type = if (att.isPossiblyEncrypted) {
+                finalFileName.getPossibleAndroidMimeType() ?: att.type
+              } else att.type
+            ),
             uri = uri,
             useContentApp = useContentApp
           )
@@ -618,8 +626,7 @@ class AttachmentDownloadManagerService : LifecycleService() {
     @RequiresApi(Build.VERSION_CODES.Q)
     private fun storeFileUsingScopedStorage(context: Context, attFile: File): Uri {
       val resolver = context.contentResolver
-      val fileExtension = FilenameUtils.getExtension(finalFileName).lowercase()
-      val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension)
+      val mimeType = finalFileName.getPossibleAndroidMimeType()
 
       val contentValues = ContentValues().apply {
         put(MediaStore.DownloadColumns.DISPLAY_NAME, finalFileName)
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt
index 9318aad0de..3305cfa927 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt
@@ -410,18 +410,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     val itemPosition = mailLabels?.subMenu?.size() ?: return
     if (itemPosition == 0) return
     val menuItem = mailLabels.subMenu?.getItem(itemPosition - 1) ?: return
-
-    if ((foldersManager.getFolderByAlias(label)?.msgCount ?: 0) > 0) {
-      val folder = foldersManager.getFolderByAlias(label) ?: return
-      val view = layoutInflater.inflate(
-        R.layout.navigation_view_item_with_amount, binding.navigationView, false
-      )
-      val textViewMsgsCount = view.findViewById<TextView>(R.id.textViewMessageCount)
-      textViewMsgsCount.text = folder.msgCount.takeIf { it > 0 }?.let { "$it" }
-      menuItem.actionView = view
-    } else {
-      menuItem.actionView = null
-    }
+    val folder = foldersManager.getFolderByAlias(label) ?: return
+    val view = layoutInflater.inflate(
+      R.layout.navigation_view_item_with_amount, binding.navigationView, false
+    )
+    val textViewMsgsCount = view.findViewById<TextView>(R.id.textViewMessageCount)
+    textViewMsgsCount.text = folder.msgCount.takeIf { it > 0 }?.let { "$it" }
+    menuItem.actionView = view
   }
 
   private fun handleLogoutFromSystemSettings(intent: Intent?): Boolean {
@@ -446,11 +441,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         roomDatabase.accountDao().logout(accountEntity)
         removeAccountFromAccountManager(accountEntity)
 
-        //todo-denbond7 Improve this via onDelete = ForeignKey.CASCADE
-        //remove all info about the given account from the local db
-        roomDatabase.msgDao().deleteByEmailSuspend(accountEntity.email)
-        roomDatabase.attachmentDao().deleteByEmailSuspend(accountEntity.email)
-
         val newActiveAccount = roomDatabase.accountDao().getActiveAccountSuspend()
         if (newActiveAccount == null) {
           roomDatabase.recipientDao().deleteAll()
@@ -598,13 +588,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
       labelsViewModel.updateOutboxMsgsCount()
     }
 
-    override fun onDrawerClosed(drawerView: View) {
-      super.onDrawerClosed(drawerView)
-      if (binding.navigationView.menu.getItem(0)?.isVisible == false) {
-        navigationViewManager?.navHeaderBinding?.layoutUserDetails?.performClick()
-      }
-    }
-
     override fun onDrawerStateChanged(newState: Int) {
       super.onDrawerStateChanged(newState)
       if (newState == 0 && slideOffset == 0f) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index a4d1242b86..bffd9126ca 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -192,9 +192,9 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
 
     override fun onChipDeleted(
       recipientType: Message.RecipientType,
-      recipientInfo: RecipientChipRecyclerViewAdapter.RecipientInfo
+      recipientItem: RecipientChipRecyclerViewAdapter.RecipientItem
     ) {
-      val email = recipientInfo.recipientWithPubKeys.recipient.email
+      val email = recipientItem.recipientWithPubKeys.recipient.email
       composeMsgViewModel.removeRecipient(recipientType, email)
     }
 
@@ -320,7 +320,10 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
             MessageType.REPLY,
             MessageType.REPLY_ALL
           )
-        }
+        },
+        draftThreadId = if (args.incomingMessageInfo?.msgEntity?.isDraft == true) {
+          args.incomingMessageInfo?.msgEntity?.threadId
+        } else null
       )
     )
   }
@@ -518,7 +521,8 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
     super.onAccountInfoRefreshed(accountEntity)
     composeMsgViewModel.updateOutgoingMessageInfo(
       composeMsgViewModel.outgoingMessageInfoStateFlow.value.copy(
-        account = accountEntity?.email
+        account = accountEntity?.email,
+        accountType = accountEntity?.accountType
       )
     )
 
@@ -905,7 +909,8 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
 
       draftViewModel.setupWithInitializationData(
         initializationData = initializationData,
-        timeInMilliseconds = startOfSessionInMilliseconds
+        timeInMilliseconds = startOfSessionInMilliseconds,
+        skipCheckingSignature = args.messageType == MessageType.DRAFT
       )
     }
 
@@ -1063,7 +1068,9 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
    */
   private fun sendMsg() {
     dismissCurrentSnackBar()
-    val outgoingMessageInfo = composeMsgViewModel.outgoingMessageInfoStateFlow.value
+    val outgoingMessageInfo = composeMsgViewModel.outgoingMessageInfoStateFlow.value.copy(
+      draftId = draftViewModel.getSessionDraftMessageEntity()?.draftId
+    )
 
     navController?.navigate(
       CreateMessageFragmentDirections
@@ -1385,6 +1392,12 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
         when (it.status) {
           Result.Status.SUCCESS -> {
             val accountEntity = it.data ?: return@collect
+
+            if (args.messageType == MessageType.DRAFT) {
+              composeMsgViewModel.markSignatureUsed()
+              return@collect
+            }
+
             if (accountEntity.useAliasSignatures) {
               val position = binding?.spinnerFrom?.selectedItemPosition?.takeIf { position ->
                 position != Spinner.INVALID_POSITION
@@ -1472,7 +1485,7 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
     }
   }
 
-  private fun updateAutoCompleteAdapter(recipients: Map<String, RecipientChipRecyclerViewAdapter.RecipientInfo>) {
+  private fun updateAutoCompleteAdapter(recipients: Map<String, RecipientChipRecyclerViewAdapter.RecipientItem>) {
     val emails = recipients.keys
     toAutoCompleteResultRecyclerViewAdapter.submitList(
       toAutoCompleteResultRecyclerViewAdapter.currentList.map {
@@ -1482,7 +1495,7 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
 
   private fun updateChipAdapter(
     recipientType: Message.RecipientType,
-    recipients: Map<String, RecipientChipRecyclerViewAdapter.RecipientInfo>
+    recipients: Map<String, RecipientChipRecyclerViewAdapter.RecipientItem>
   ) {
     when (recipientType) {
       Message.RecipientType.TO -> toRecipientsChipRecyclerViewAdapter.submitList(
@@ -2143,6 +2156,24 @@ class CreateMessageFragment : BaseFragment<FragmentCreateMessageBinding>(),
     var useNewSignature = false
 
     val oldSignature = composeMsgViewModel.outgoingMessageInfoStateFlow.value.signature
+    if (oldSignature == null && args.messageType == MessageType.DRAFT) {
+      val extractedSignature = aliases.firstOrNull { alias ->
+        alias.plainTextSignature != null && binding?.editTextEmailMessage?.text?.contains(
+          ("^${alias.plainTextSignature}$").toRegex(RegexOption.MULTILINE)
+        ) == true
+      }?.plainTextSignature
+
+      if (!extractedSignature.isNullOrEmpty()) {
+        composeMsgViewModel.updateOutgoingMessageInfo(
+          composeMsgViewModel.outgoingMessageInfoStateFlow.value.copy(
+            signature = extractedSignature
+          )
+        )
+      }
+
+      return
+    }
+
     val messageHasOldSignature = oldSignature != null && binding?.editTextEmailMessage?.text?.contains(
       ("^$oldSignature$").toRegex(RegexOption.MULTILINE)
     ) == true
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ImportAdditionalPrivateKeysFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ImportAdditionalPrivateKeysFragment.kt
index 03a56020df..6500abd2dd 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ImportAdditionalPrivateKeysFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ImportAdditionalPrivateKeysFragment.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment
@@ -221,7 +221,10 @@ class ImportAdditionalPrivateKeysFragment :
             it.data?.let { pair ->
               setFragmentResult(
                 args.requestKey,
-                bundleOf(KEY_IMPORTED_PRIVATE_KEYS to ArrayList(pair.second))
+                bundleOf(
+                  KEY_IMPORTED_PRIVATE_KEYS to ArrayList(pair.second),
+                  KEY_INCOMING_BUNDLE to args.bundle
+                )
               )
             }
             countingIdlingResource?.decrementSafely(this@ImportAdditionalPrivateKeysFragment)
@@ -419,5 +422,9 @@ class ImportAdditionalPrivateKeysFragment :
     val KEY_IMPORTED_PRIVATE_KEYS = GeneralUtil.generateUniqueExtraKey(
       "KEY_IMPORTED_PRIVATE_KEYS", ImportAdditionalPrivateKeysFragment::class.java
     )
+
+    val KEY_INCOMING_BUNDLE = GeneralUtil.generateUniqueExtraKey(
+      "KEY_INCOMING_BUNDLE", ImportAdditionalPrivateKeysFragment::class.java
+    )
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
index 417ee456bd..0294283276 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment
@@ -21,8 +21,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.text.Html
-import android.text.SpannableStringBuilder
-import android.text.format.DateUtils
 import android.transition.TransitionManager
 import android.view.LayoutInflater
 import android.view.Menu
@@ -39,7 +37,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.ColorRes
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
-import androidx.core.text.toSpannable
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
@@ -93,8 +90,6 @@ import com.flowcrypt.email.extensions.exceptionMsg
 import com.flowcrypt.email.extensions.exceptionMsgWithStack
 import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.incrementSafely
-import com.flowcrypt.email.extensions.jakarta.mail.internet.getFormattedString
-import com.flowcrypt.email.extensions.jakarta.mail.internet.personalOrEmail
 import com.flowcrypt.email.extensions.visible
 import com.flowcrypt.email.extensions.visibleOrGone
 import com.flowcrypt.email.extensions.visibleOrInvisible
@@ -110,6 +105,7 @@ import com.flowcrypt.email.jetpack.workmanager.sync.MarkAsNotSpamWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.MovingToInboxWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.MovingToSpamWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.UpdateMsgsSeenStateWorker
+import com.flowcrypt.email.model.MessageAction
 import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.model.MessageType
 import com.flowcrypt.email.providers.EmbeddedAttachmentsProvider
@@ -131,7 +127,7 @@ import com.flowcrypt.email.ui.activity.fragment.dialog.DownloadAttachmentDialogF
 import com.flowcrypt.email.ui.activity.fragment.dialog.TwoWayDialogFragment
 import com.flowcrypt.email.ui.adapter.AttachmentsRecyclerViewAdapter
 import com.flowcrypt.email.ui.adapter.GmailApiLabelsListAdapter
-import com.flowcrypt.email.ui.adapter.MsgDetailsRecyclerViewAdapter
+import com.flowcrypt.email.ui.adapter.MessageHeadersListAdapter
 import com.flowcrypt.email.ui.adapter.PgpBadgeListAdapter
 import com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration.MarginItemDecoration
 import com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration.VerticalSpaceMarginItemDecoration
@@ -150,7 +146,6 @@ import com.google.android.gms.auth.UserRecoverableAuthException
 import com.google.android.material.snackbar.Snackbar
 import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException
 import jakarta.mail.AuthenticationFailedException
-import jakarta.mail.internet.InternetAddress
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.apache.commons.io.FilenameUtils
@@ -187,7 +182,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
     }
   }
 
-  val requestPermissionLauncher =
+  private val requestPermissionLauncher =
     registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
       if (isGranted) {
         downloadAttachment()
@@ -284,7 +279,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
   private var folderType: FoldersManager.FolderType? = null
   private val labelsViewModel: LabelsViewModel by viewModels()
   private val recipientsViewModel: RecipientsViewModel by viewModels()
-  private val msgDetailsAdapter = MsgDetailsRecyclerViewAdapter()
+  private val msgDetailsAdapter = MessageHeadersListAdapter()
   private val pgpBadgeListAdapter = PgpBadgeListAdapter()
   private val gmailApiLabelsListAdapter = GmailApiLabelsListAdapter(
     object : GmailApiLabelsListAdapter.OnLabelClickListener {
@@ -377,20 +372,20 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
         val menuActionChangeLabels = menu.findItem(R.id.menuActionChangeLabels)
 
         menuItemArchiveMsg?.isVisible = msgDetailsViewModel.getMessageActionAvailability(
-          MsgDetailsViewModel.MessageAction.ARCHIVE
+          MessageAction.ARCHIVE
         )
         menuItemDeleteMsg?.isVisible = isDeleteActionEnabled
         menuActionMoveToInbox?.isVisible = msgDetailsViewModel.getMessageActionAvailability(
-          MsgDetailsViewModel.MessageAction.MOVE_TO_INBOX
+          MessageAction.MOVE_TO_INBOX
         )
         menuActionMarkUnread?.isVisible =
           !JavaEmailConstants.FOLDER_OUTBOX.equals(args.messageEntity.folder, ignoreCase = true)
         menuActionMoveToSpam?.isVisible = isMoveToSpamActionEnabled
         menuActionMarkAsNotSpam?.isVisible = msgDetailsViewModel.getMessageActionAvailability(
-          MsgDetailsViewModel.MessageAction.MARK_AS_NOT_SPAM
+          MessageAction.MARK_AS_NOT_SPAM
         )
         menuActionChangeLabels?.isVisible = msgDetailsViewModel.getMessageActionAvailability(
-          MsgDetailsViewModel.MessageAction.CHANGE_LABELS
+          MessageAction.CHANGE_LABELS
         )
 
         menuItemArchiveMsg?.isEnabled = isAdditionalActionEnabled
@@ -491,7 +486,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
 
   override fun onClick(v: View) {
     when (v.id) {
-      R.id.layoutReplyButton -> {
+      R.id.replyButton -> {
         startActivity(
           CreateMessageActivity.generateIntent(
             context, MessageType.REPLY, msgEncryptType, prepareMsgInfoForReply()
@@ -499,7 +494,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
         )
       }
 
-      R.id.imageButtonReplyAll, R.id.layoutReplyAllButton -> {
+      R.id.imageButtonReplyAll, R.id.replyAllButton -> {
         startActivity(
           CreateMessageActivity.generateIntent(
             context, MessageType.REPLY_ALL, msgEncryptType, prepareMsgInfoForReply()
@@ -513,12 +508,12 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
         popup.setOnMenuItemClickListener {
           when (it.itemId) {
             R.id.menuActionReply -> {
-              binding?.layoutReplyButtons?.layoutReplyButton?.let { view -> onClick(view) }
+              binding?.layoutReplyButtons?.replyButton?.let { view -> onClick(view) }
               true
             }
 
             R.id.menuActionForward -> {
-              binding?.layoutReplyButtons?.layoutFwdButton?.let { view -> onClick(view) }
+              binding?.layoutReplyButtons?.forwardButton?.let { view -> onClick(view) }
               true
             }
 
@@ -532,7 +527,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
       }
 
 
-      R.id.layoutFwdButton -> {
+      R.id.forwardButton -> {
         if (attachmentsRecyclerViewAdapter.currentList.none {
             it.isEmbeddedAndPossiblyEncrypted()
           }) {
@@ -672,7 +667,7 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
   private fun showSendersPublicKeyDialog() {
     showChoosePublicKeyDialogFragment(
       requestKey = REQUEST_KEY_CHOOSE_PUBLIC_KEY + args.messageEntity.id?.toString(),
-      email = args.messageEntity.email,
+      email = args.messageEntity.account,
       choiceMode = ListView.CHOICE_MODE_SINGLE,
       titleResourceId = R.plurals.tell_sender_to_update_their_settings
     )
@@ -919,105 +914,10 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
   }
 
   private fun updateMsgDetails(messageEntity: MessageEntity) {
-    binding?.tVTo?.text = prepareToText()
-
-    val headers = mutableListOf<MsgDetailsRecyclerViewAdapter.Header>().apply {
-      add(
-        MsgDetailsRecyclerViewAdapter.Header(
-          name = getString(R.string.from),
-          value = formatAddresses(messageEntity.from)
-        )
-      )
-
-      if (messageEntity.replyToAddress.isNotEmpty()) {
-        add(
-          MsgDetailsRecyclerViewAdapter.Header(
-            name = getString(R.string.reply_to),
-            value = formatAddresses(messageEntity.replyToAddress)
-          )
-        )
-      }
-
-      add(
-        MsgDetailsRecyclerViewAdapter.Header(
-          name = getString(R.string.to),
-          value = formatAddresses(messageEntity.to).ifEmpty { getString(R.string.no_recipients) }
-        )
-      )
-
-      if (messageEntity.cc.isNotEmpty()) {
-        add(
-          MsgDetailsRecyclerViewAdapter.Header(
-            name = getString(R.string.cc),
-            value = formatAddresses(messageEntity.cc)
-          )
-        )
-      }
-
-      add(
-        MsgDetailsRecyclerViewAdapter.Header(
-          name = getString(R.string.date),
-          value = prepareDateHeaderValue(messageEntity)
-        )
-      )
-    }
-
-    msgDetailsAdapter.submitList(headers)
+    binding?.tVTo?.text = messageEntity.generateToText(requireContext())
+    msgDetailsAdapter.submitList(messageEntity.generateDetailsHeaders(requireContext()))
   }
 
-  private fun prepareDateHeaderValue(messageEntity: MessageEntity): String {
-    val dateInMilliseconds: Long =
-      if (JavaEmailConstants.FOLDER_OUTBOX.equals(messageEntity.folder, ignoreCase = true)) {
-        messageEntity.sentDate ?: 0
-      } else {
-        messageEntity.receivedDate ?: 0
-      }
-
-    val flags = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME or
-        DateUtils.FORMAT_SHOW_YEAR
-    return DateUtils.formatDateTime(context, dateInMilliseconds, flags)
-  }
-
-  private fun prepareToText(): String {
-    val stringBuilder = SpannableStringBuilder()
-    val meAddress = args.messageEntity.to.firstOrNull {
-      it.address.equals(args.messageEntity.email, true)
-    }
-    val leftAddresses: List<InternetAddress>
-    if (meAddress == null) {
-      leftAddresses = args.messageEntity.to
-    } else {
-      stringBuilder.append(getString(R.string.me))
-      leftAddresses = ArrayList(args.messageEntity.to) - meAddress
-      if (leftAddresses.isNotEmpty()) {
-        stringBuilder.append(", ")
-      }
-    }
-
-    val to = leftAddresses.foldIndexed(stringBuilder) { index, builder, it ->
-      builder.append(it.personalOrEmail)
-      if (index != leftAddresses.size - 1) {
-        builder.append(",")
-      }
-      builder
-    }.toSpannable()
-
-    return getString(R.string.to_receiver, to)
-  }
-
-  private fun formatAddresses(addresses: List<InternetAddress>) =
-    addresses.foldIndexed(SpannableStringBuilder()) { index, builder, it ->
-      if (index < MAX_ALLOWED_RECIPIENTS_IN_HEADER_VALUE) {
-        builder.append(it.getFormattedString())
-        if (index != addresses.size - 1) {
-          builder.append("\n")
-        }
-      } else if (index == MAX_ALLOWED_RECIPIENTS_IN_HEADER_VALUE + 1) {
-        builder.append(getString(R.string.and_others))
-      }
-      builder
-    }.toSpannable()
-
   private fun updateMsgView() {
     val inlineEncryptedAtts = mutableListOf<AttachmentInfo>()
     binding?.emailWebView?.loadUrl("about:blank")
@@ -1182,38 +1082,35 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
    */
   private fun updateReplyButtons() {
     if (binding?.layoutReplyButtons != null) {
-      val imageViewReply = binding?.layoutReplyButtons?.imageViewReply
-      val imageViewReplyAll = binding?.layoutReplyButtons?.imageViewReplyAll
-      val imageViewFwd = binding?.layoutReplyButtons?.imageViewFwd
-
-      val textViewReply = binding?.layoutReplyButtons?.textViewReply
-      val textViewReplyAll = binding?.layoutReplyButtons?.textViewReplyAll
-      val textViewFwd = binding?.layoutReplyButtons?.textViewFwd
+      val replyButton = binding?.layoutReplyButtons?.replyButton
+      val replyAllButton = binding?.layoutReplyButtons?.replyAllButton
+      val forwardButton = binding?.layoutReplyButtons?.forwardButton
 
       val buttonsColorId: Int
 
       if (msgEncryptType === MessageEncryptionType.ENCRYPTED) {
         buttonsColorId = R.color.colorPrimary
-        textViewReply?.setText(R.string.reply_encrypted)
-        textViewReplyAll?.setText(R.string.reply_all_encrypted)
-        textViewFwd?.setText(R.string.forward_encrypted)
+        replyButton?.setText(R.string.reply_encrypted)
+        replyAllButton?.setText(R.string.reply_all_encrypted)
+        forwardButton?.setText(R.string.forward_encrypted)
       } else {
         buttonsColorId = R.color.red
-        textViewReply?.setText(R.string.reply)
-        textViewReplyAll?.setText(R.string.reply_all)
-        textViewFwd?.setText(R.string.forward)
+        replyButton?.setText(R.string.reply)
+        replyAllButton?.setText(R.string.reply_all)
+        forwardButton?.setText(R.string.forward)
       }
 
-      val colorStateList = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), buttonsColorId))
+      val colorStateList =
+        ColorStateList.valueOf(ContextCompat.getColor(requireContext(), buttonsColorId))
 
       binding?.imageButtonReplyAll?.imageTintList = colorStateList
-      imageViewReply?.imageTintList = colorStateList
-      imageViewReplyAll?.imageTintList = colorStateList
-      imageViewFwd?.imageTintList = colorStateList
+      replyButton?.iconTint = colorStateList
+      replyAllButton?.iconTint = colorStateList
+      forwardButton?.iconTint = colorStateList
 
-      binding?.layoutReplyButtons?.layoutReplyButton?.setOnClickListener(this)
-      binding?.layoutReplyButtons?.layoutFwdButton?.setOnClickListener(this)
-      binding?.layoutReplyButtons?.layoutReplyAllButton?.setOnClickListener(this)
+      replyButton?.setOnClickListener(this)
+      replyAllButton?.setOnClickListener(this)
+      forwardButton?.setOnClickListener(this)
       binding?.layoutReplyButtons?.root?.visibleOrGone(
         !args.messageEntity.isOutboxMsg && !args.messageEntity.isDraft
       )
@@ -2130,7 +2027,6 @@ class MessageDetailsFragment : BaseFragment<FragmentMessageDetailsBinding>(), Pr
     private const val REQUEST_CODE_DELETE_MESSAGE_DIALOG = 103
     private const val REQUEST_CODE_SHOW_WARNING_DIALOG_FOR_DOWNLOADING_DANGEROUS_FILE = 104
     private const val CONTENT_MAX_ALLOWED_LENGTH = 50000
-    private const val MAX_ALLOWED_RECIPIENTS_IN_HEADER_VALUE = 10
 
     private const val REQUEST_CODE_SAVE_ATTACHMENT = 1000
     private const val REQUEST_CODE_PREVIEW_ATTACHMENT = 1001
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessagesListFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessagesListFragment.kt
index faf00c2fe6..db2ee2c368 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessagesListFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessagesListFragment.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment
@@ -29,7 +29,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
-import androidx.appcompat.widget.SwitchCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
@@ -38,7 +37,6 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavDirections
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.selection.SelectionTracker
 import androidx.recyclerview.selection.StorageStrategy
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -46,7 +44,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.flowcrypt.email.Constants
 import com.flowcrypt.email.NavGraphDirections
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.FoldersManager
@@ -92,13 +89,11 @@ import com.flowcrypt.email.ui.activity.fragment.base.ListProgressBehaviour
 import com.flowcrypt.email.ui.activity.fragment.dialog.ChangeGmailLabelsDialogFragmentArgs
 import com.flowcrypt.email.ui.activity.fragment.dialog.InfoDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.TwoWayDialogFragment
-import com.flowcrypt.email.ui.activity.fragment.preferences.NotificationsSettingsFragment
 import com.flowcrypt.email.ui.adapter.MsgsPagedListAdapter
 import com.flowcrypt.email.ui.adapter.selection.CustomStableIdKeyProvider
 import com.flowcrypt.email.ui.adapter.selection.MsgItemDetailsLookup
 import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.OutgoingMessagesManager
-import com.flowcrypt.email.util.SharedPreferencesHelper
 import com.flowcrypt.email.util.exception.CommonConnectionException
 import com.google.android.gms.auth.UserRecoverableAuthException
 import com.google.android.material.snackbar.Snackbar
@@ -426,14 +421,29 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
             )
           } else {
             currentFolder?.let { localFolder ->
-              navController?.navigateSafe(
-                currentDestinationId = R.id.messagesListFragment,
-                directions = MessagesListFragmentDirections
-                  .actionMessagesListFragmentToViewPagerMessageDetailsFragment(
-                    messageEntityId = msgEntity.id ?: -1,
-                    localFolder = localFolder
-                  )
-              )
+              if (account?.isGoogleSignInAccount == true
+                && account?.useAPI == true
+                && account?.useConversationMode == true
+                && !isOutbox
+              ) {
+                navController?.navigateSafe(
+                  currentDestinationId = R.id.messagesListFragment,
+                  directions = MessagesListFragmentDirections
+                    .actionMessagesListFragmentToViewPagerThreadDetailsFragment(
+                      messageEntityId = msgEntity.id ?: -1,
+                      localFolder = localFolder
+                    )
+                )
+              } else {
+                navController?.navigateSafe(
+                  currentDestinationId = R.id.messagesListFragment,
+                  directions = MessagesListFragmentDirections
+                    .actionMessagesListFragmentToViewPagerMessageDetailsFragment(
+                      messageEntityId = msgEntity.id ?: -1,
+                      localFolder = localFolder
+                    )
+                )
+              }
             }
           }
         }
@@ -512,14 +522,14 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
 
       MessageState.ERROR_PRIVATE_KEY_NOT_FOUND -> {
         val errorMsg = messageEntity.errorMsg
-        message = if (errorMsg?.equals(messageEntity.email, ignoreCase = true) == true) {
+        message = if (errorMsg?.equals(messageEntity.account, ignoreCase = true) == true) {
           getString(
             R.string.no_key_available_for_your_email_account,
             getString(R.string.support_email)
           )
         } else {
           getString(
-            R.string.no_key_available_for_your_emails, errorMsg, messageEntity.email,
+            R.string.no_key_available_for_your_emails, errorMsg, messageEntity.account,
             getString(R.string.support_email)
           )
         }
@@ -551,10 +561,16 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
   }
 
   private fun isItSyncOrCachedFolder(localFolder: LocalFolder?): Boolean {
+    val checkDrafts = if (account?.useConversationMode == true) {
+      false
+    } else {
+      isDraftsFolder
+    }
+
     return localFolder?.fullName.equals(
       JavaEmailConstants.FOLDER_INBOX,
       ignoreCase = true
-    ) || isOutboxFolder || isDraftsFolder
+    ) || isOutboxFolder || checkDrafts
   }
 
   /**
@@ -562,7 +578,11 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
    */
   private fun refreshMsgs() {
     currentFolder?.let {
-      msgsViewModel.refreshMsgs(it)
+      if (adapter.currentList?.isEmpty() == true) {
+        msgsViewModel.loadMsgsFromRemoteServer()
+      } else {
+        msgsViewModel.refreshMsgs(it)
+      }
     }
   }
 
@@ -725,8 +745,10 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
       }
 
       override fun isItemViewSwipeEnabled(): Boolean {
-        return actionMode == null && AccountEntity.ACCOUNT_TYPE_GOOGLE == account?.accountType
+        return actionMode == null
+            && AccountEntity.ACCOUNT_TYPE_GOOGLE == account?.accountType
             && currentFolder?.getFolderType() == FoldersManager.FolderType.INBOX
+            && currentFolder?.searchQuery == null
       }
 
       override fun isLongPressDragEnabled(): Boolean = false
@@ -891,7 +913,7 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
                 msgsViewModel.changeMsgsState(
                   ids = ids,
                   localFolder = it,
-                  newMsgState = if (it.isDrafts) {
+                  newMsgState = if (account?.useConversationMode == false && it.isDrafts) {
                     MessageState.PENDING_DELETING_DRAFT
                   } else {
                     MessageState.PENDING_DELETING
@@ -964,6 +986,7 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
         menu?.findItem(R.id.menuActionMarkAsNotSpam)?.isVisible = isMarkNotSpamActionEnabled()
         menu?.findItem(R.id.menuActionChangeLabels)?.isVisible =
           account?.isGoogleSignInAccount == true
+        menu?.findItem(R.id.menuActionDeleteMessage)?.isVisible = !isDraftsFolder
 
         val menuActionMarkRead = menu?.findItem(R.id.menuActionMarkRead)
         menuActionMarkRead?.isVisible = isChangeSeenStateActionEnabled()
@@ -1333,7 +1356,9 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
 
   private fun isMoveToInboxActionEnabled(): Boolean {
     return when (FoldersManager.getFolderType(currentFolder)) {
-      FoldersManager.FolderType.OUTBOX, FoldersManager.FolderType.SPAM -> false
+      FoldersManager.FolderType.OUTBOX,
+      FoldersManager.FolderType.SPAM,
+      FoldersManager.FolderType.INBOX -> false
 
       else -> if (AccountEntity.ACCOUNT_TYPE_GOOGLE == account?.accountType) {
         val selection = tracker?.selection?.map { it }
@@ -1343,7 +1368,7 @@ class MessagesListFragment : BaseFragment<FragmentMessagesListBinding>(), ListPr
           it.labelIds?.split(MessageEntity.LABEL_IDS_SEPARATOR)
             ?.contains(JavaEmailConstants.FOLDER_INBOX) == false
         }
-      } else false
+      } else true
     }
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ThreadDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ThreadDetailsFragment.kt
new file mode 100644
index 0000000000..fdfb36aff3
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ThreadDetailsFragment.kt
@@ -0,0 +1,1571 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment
+
+import android.Manifest
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.ColorStateList
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ListView
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
+import androidx.core.view.MenuHost
+import androidx.core.view.MenuProvider
+import androidx.core.view.forEach
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModel
+import androidx.navigation.NavDirections
+import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.work.WorkManager
+import com.flowcrypt.email.Constants
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.FoldersManager
+import com.flowcrypt.email.api.email.model.AttachmentInfo
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.api.email.model.ServiceInfo
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.database.MessageState
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.database.entity.PublicKeyEntity
+import com.flowcrypt.email.databinding.FragmentThreadDetailsBinding
+import com.flowcrypt.email.extensions.android.os.getParcelableArrayListViaExt
+import com.flowcrypt.email.extensions.android.os.getParcelableViaExt
+import com.flowcrypt.email.extensions.androidx.fragment.app.launchAndRepeatWithViewLifecycle
+import com.flowcrypt.email.extensions.androidx.fragment.app.navController
+import com.flowcrypt.email.extensions.androidx.fragment.app.setFragmentResultListener
+import com.flowcrypt.email.extensions.androidx.fragment.app.setFragmentResultListenerForTwoWayDialog
+import com.flowcrypt.email.extensions.androidx.fragment.app.showChoosePublicKeyDialogFragment
+import com.flowcrypt.email.extensions.androidx.fragment.app.showInfoDialog
+import com.flowcrypt.email.extensions.androidx.fragment.app.showNeedPassphraseDialog
+import com.flowcrypt.email.extensions.androidx.fragment.app.showTwoWayDialog
+import com.flowcrypt.email.extensions.androidx.fragment.app.supportActionBar
+import com.flowcrypt.email.extensions.androidx.fragment.app.toast
+import com.flowcrypt.email.extensions.exceptionMsg
+import com.flowcrypt.email.extensions.gone
+import com.flowcrypt.email.extensions.showDialogFragment
+import com.flowcrypt.email.extensions.visibleOrGone
+import com.flowcrypt.email.jetpack.lifecycle.CustomAndroidViewModelFactory
+import com.flowcrypt.email.jetpack.viewmodel.RecipientsViewModel
+import com.flowcrypt.email.jetpack.viewmodel.ThreadDetailsViewModel
+import com.flowcrypt.email.jetpack.workmanager.MessagesSenderWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.ArchiveMsgsWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.DeleteDraftsWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.DeleteMessagesPermanentlyWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.DeleteMessagesWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.MarkAsNotSpamWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.MovingToInboxWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.MovingToSpamWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.UpdateMsgsSeenStateWorker
+import com.flowcrypt.email.jetpack.workmanager.sync.UploadDraftsWorker
+import com.flowcrypt.email.model.MessageAction
+import com.flowcrypt.email.model.MessageEncryptionType
+import com.flowcrypt.email.model.MessageType
+import com.flowcrypt.email.providers.EmbeddedAttachmentsProvider
+import com.flowcrypt.email.security.KeysStorageImpl
+import com.flowcrypt.email.security.model.PgpKeyRingDetails
+import com.flowcrypt.email.service.attachment.AttachmentDownloadManagerService
+import com.flowcrypt.email.ui.activity.CreateMessageActivity
+import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
+import com.flowcrypt.email.ui.activity.fragment.base.ProgressBehaviour
+import com.flowcrypt.email.ui.activity.fragment.dialog.ChangeGmailLabelsDialogFragmentArgs
+import com.flowcrypt.email.ui.activity.fragment.dialog.ChoosePublicKeyDialogFragment
+import com.flowcrypt.email.ui.activity.fragment.dialog.DecryptAttachmentDialogFragment
+import com.flowcrypt.email.ui.activity.fragment.dialog.DecryptAttachmentDialogFragmentArgs
+import com.flowcrypt.email.ui.activity.fragment.dialog.DeleteDraftDialogFragment
+import com.flowcrypt.email.ui.activity.fragment.dialog.DeleteDraftDialogFragmentArgs
+import com.flowcrypt.email.ui.activity.fragment.dialog.DownloadAttachmentDialogFragment
+import com.flowcrypt.email.ui.activity.fragment.dialog.DownloadAttachmentDialogFragmentArgs
+import com.flowcrypt.email.ui.activity.fragment.dialog.FixNeedPassphraseIssueDialogFragment
+import com.flowcrypt.email.ui.activity.fragment.dialog.ProcessMessageDialogFragment
+import com.flowcrypt.email.ui.activity.fragment.dialog.ProcessMessageDialogFragmentArgs
+import com.flowcrypt.email.ui.activity.fragment.dialog.TwoWayDialogFragment
+import com.flowcrypt.email.ui.adapter.GmailApiLabelsListAdapter
+import com.flowcrypt.email.ui.adapter.MessagesInThreadListAdapter
+import com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration.SkipFirstAndLastDividerItemDecoration
+import com.flowcrypt.email.util.GeneralUtil
+import com.flowcrypt.email.util.exception.ThreadNotFoundException
+import com.google.api.client.googleapis.json.GoogleJsonResponseException
+import org.apache.commons.io.FilenameUtils
+import java.net.HttpURLConnection
+import java.util.concurrent.TimeUnit
+
+/**
+ * @author Denys Bondarenko
+ */
+class ThreadDetailsFragment : BaseFragment<FragmentThreadDetailsBinding>(), ProgressBehaviour {
+  override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+    FragmentThreadDetailsBinding.inflate(inflater, container, false)
+
+  override val progressView: View?
+    get() = binding?.progress?.root
+  override val contentView: View?
+    get() = binding?.groupContent
+  override val statusView: View?
+    get() = binding?.status?.root
+
+  private val isAdditionalActionEnabled: Boolean
+    get() = threadDetailsViewModel.messagesInThreadFlow.value.status == Result.Status.SUCCESS
+  private val threadMessageEntity: MessageEntity?
+    get() = threadDetailsViewModel.threadMessageEntityFlow.value
+  private val localFolder: LocalFolder?
+    get() = threadDetailsViewModel.localFolderFlow.value
+
+  private val args by navArgs<ThreadDetailsFragmentArgs>()
+  private var isActive: Boolean = false
+  private val recipientsViewModel: RecipientsViewModel by viewModels()
+  private val threadDetailsViewModel: ThreadDetailsViewModel by viewModels {
+    object : CustomAndroidViewModelFactory(requireActivity().application) {
+      @Suppress("UNCHECKED_CAST")
+      override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return ThreadDetailsViewModel(
+          threadMessageEntityId = args.messageEntityId,
+          localFolder = args.localFolder,
+          application = requireActivity().application
+        ) as T
+      }
+    }
+  }
+  private val requestPermissionLauncher =
+    registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+      toast(
+        if (isGranted) {
+          R.string.permissions_granted_and_now_you_can_download_attachments
+        } else {
+          R.string.cannot_save_attachment_without_permission
+        }, Toast.LENGTH_LONG
+      )
+    }
+
+  private val messagesInThreadListAdapter = MessagesInThreadListAdapter(
+    object : MessagesInThreadListAdapter.AdapterListener {
+      override fun onDataSubmitted(list: List<MessagesInThreadListAdapter.Item>?) {
+        val freshestMessageInConversation =
+          (list?.lastOrNull() as? MessagesInThreadListAdapter.Message)
+        updateThreadReplyButtons(
+          if (freshestMessageInConversation?.messageEntity?.isDraft == true) {
+            null
+          } else {
+            freshestMessageInConversation
+          }
+        )
+      }
+    },
+    object : MessagesInThreadListAdapter.OnMessageActionsListener {
+      override fun onMessageClick(position: Int, message: MessagesInThreadListAdapter.Message) {
+        processMessageClick(message)
+      }
+
+      override fun onHeadersDetailsClick(
+        position: Int,
+        message: MessagesInThreadListAdapter.Message
+      ) {
+        threadDetailsViewModel.onHeadersDetailsClick(message)
+      }
+
+      override fun onMessageChanged(position: Int, message: MessagesInThreadListAdapter.Message) {
+        threadDetailsViewModel.onMessageChanged(message)
+      }
+
+      override fun onLabelClicked(label: GmailApiLabelsListAdapter.Label) {
+        if (args.localFolder.searchQuery == null) {
+          changeGmailLabels()
+        }
+      }
+
+      override fun onAttachmentDownloadClick(
+        attachmentInfo: AttachmentInfo,
+        message: MessagesInThreadListAdapter.Message
+      ) {
+        handleAttachmentDownloadClick(attachmentInfo, message)
+      }
+
+      override fun onAttachmentPreviewClick(
+        attachmentInfo: AttachmentInfo,
+        message: MessagesInThreadListAdapter.Message
+      ) {
+        handleAttachmentPreviewClick(attachmentInfo, message)
+      }
+
+      override fun onReply(message: MessagesInThreadListAdapter.Message) {
+        replyTo(message)
+      }
+
+      override fun onReplyAll(message: MessagesInThreadListAdapter.Message) {
+        replyAllTo(message)
+      }
+
+      override fun onForward(message: MessagesInThreadListAdapter.Message) {
+        forward(message)
+      }
+
+      override fun onEditDraft(message: MessagesInThreadListAdapter.Message) {
+        editDraft(message)
+      }
+
+      override fun onDeleteDraft(message: MessagesInThreadListAdapter.Message) {
+        deleteDraft(message)
+      }
+
+      override fun addRecipientsBasedOnPgpKeyDetails(pgpKeyRingDetails: PgpKeyRingDetails) {
+        recipientsViewModel.addRecipientsBasedOnPgpKeyDetails(pgpKeyRingDetails)
+        toast(R.string.pub_key_successfully_imported)
+      }
+
+      override fun updateExistingPubKey(
+        publicKeyEntity: PublicKeyEntity,
+        pgpKeyRingDetails: PgpKeyRingDetails
+      ) {
+        recipientsViewModel.updateExistingPubKey(publicKeyEntity, pgpKeyRingDetails)
+        toast(R.string.pub_key_successfully_updated)
+      }
+
+      override fun importAdditionalPrivateKeys(message: MessagesInThreadListAdapter.Message) {
+        account?.let { accountEntity ->
+          navController?.navigate(
+            object : NavDirections {
+              override val actionId = R.id.import_additional_private_keys_graph
+              override val arguments = ImportAdditionalPrivateKeysFragmentArgs(
+                requestKey = REQUEST_KEY_IMPORT_ADDITIONAL_PRIVATE_KEYS + args.messageEntityId.toString(),
+                accountEntity = accountEntity,
+                bundle = Bundle().apply { putLong(KEY_EXTRA_MESSAGE_ID, message.id) }
+              ).toBundle()
+            }
+          )
+        }
+      }
+
+      override fun fixMissingPassphraseIssue(
+        message: MessagesInThreadListAdapter.Message,
+        fingerprints: List<String>
+      ) {
+        showNeedPassphraseDialog(
+          requestKey = REQUEST_KEY_FIX_MISSING_PASSPHRASE + args.messageEntityId.toString(),
+          requestCode = REQUEST_CODE_FIX_MISSING_PASSPHRASE_AFTER_PROCESS_MESSAGE,
+          fingerprints = fingerprints,
+          bundle = Bundle().apply { putLong(KEY_EXTRA_MESSAGE_ID, message.id) }
+        )
+      }
+
+      override fun showSendersPublicKeyDialog(message: MessagesInThreadListAdapter.Message) {
+        showChoosePublicKeyDialogFragment(
+          requestKey = REQUEST_KEY_CHOOSE_PUBLIC_KEY + args.messageEntityId.toString(),
+          email = message.messageEntity.account,
+          choiceMode = ListView.CHOICE_MODE_SINGLE,
+          titleResourceId = R.plurals.tell_sender_to_update_their_settings,
+          bundle = Bundle().apply { putLong(KEY_EXTRA_MESSAGE_ID, message.id) }
+        )
+      }
+
+      override fun getAccount(): AccountEntity? = account
+    })
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    isActive = !args.isViewPagerMode
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    updateActionBar()
+
+    initViews()
+    setupThreadDetailsViewModel()
+    subscribeToTwoWayDialog()
+    subscribeToProcessMessageDialogFragment()
+    subscribeToFixNeedPassphraseIssueDialogFragment()
+    subscribeToDownloadAttachmentViaDialog()
+    subscribeToDeleteDraftDialog()
+    subscribeToImportingAdditionalPrivateKeys()
+    subscribeToChoosePublicKeyDialogFragment()
+    subscribeToDecryptAttachmentViaDialog()
+    subscribeToDraftsUpdates()
+  }
+
+  override fun onSetupActionBarMenu(menuHost: MenuHost) {
+    super.onSetupActionBarMenu(menuHost)
+
+    menuHost.addMenuProvider(object : MenuProvider {
+      override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        if (!args.isViewPagerMode) {
+          menuInflater.inflate(R.menu.fragment_thread_details, menu)
+        }
+      }
+
+      override fun onPrepareMenu(menu: Menu) {
+        super.onPrepareMenu(menu)
+        val ids = listOf(
+          R.id.menuActionArchiveMessage,
+          R.id.menuActionDeleteMessage,
+          R.id.menuActionMoveToInbox,
+          R.id.menuActionMarkUnread,
+          R.id.menuActionMoveToSpam,
+          R.id.menuActionMarkAsNotSpam,
+          R.id.menuActionChangeLabels,
+        )
+
+        menu.forEach { item: MenuItem ->
+          if (args.localFolder.searchQuery != null) {
+            if (item.itemId in ids) {
+              item.isVisible = false
+            }
+          } else if (item.itemId in ids) {
+            item.isEnabled = isAdditionalActionEnabled
+            item.isVisible = threadDetailsViewModel.getMessageActionAvailability(
+              when (item.itemId) {
+                R.id.menuActionArchiveMessage -> MessageAction.ARCHIVE
+                R.id.menuActionDeleteMessage -> MessageAction.DELETE
+                R.id.menuActionMoveToInbox -> MessageAction.MOVE_TO_INBOX
+                R.id.menuActionMarkUnread -> MessageAction.MARK_UNREAD
+                R.id.menuActionMoveToSpam -> MessageAction.MOVE_TO_SPAM
+                R.id.menuActionMarkAsNotSpam -> MessageAction.MARK_AS_NOT_SPAM
+                R.id.menuActionChangeLabels -> MessageAction.CHANGE_LABELS
+                else -> error("Unreached")
+              }
+            )
+          }
+        }
+      }
+
+      override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        return when (menuItem.itemId) {
+          R.id.menuActionArchiveMessage -> {
+            threadDetailsViewModel.changeMsgState(MessageState.PENDING_ARCHIVING)
+            true
+          }
+
+          R.id.menuActionDeleteMessage -> {
+            val messageEntity = threadMessageEntity ?: return true
+            if (!messageEntity.isOutboxMsg) {
+              if (localFolder?.getFolderType() == FoldersManager.FolderType.TRASH) {
+                showTwoWayDialog(
+                  requestKey = REQUEST_KEY_TWO_WAY_DIALOG_BASE + args.messageEntityId.toString(),
+                  requestCode = REQUEST_CODE_DELETE_MESSAGE_DIALOG,
+                  dialogTitle = "",
+                  dialogMsg = requireContext().resources.getQuantityString(
+                    R.plurals.delete_thread_question,
+                    1,
+                    1
+                  ),
+                  positiveButtonTitle = getString(android.R.string.ok),
+                  negativeButtonTitle = getString(android.R.string.cancel),
+                )
+              } else {
+                threadDetailsViewModel.changeMsgState(
+                  if (messageEntity.isDraft) {
+                    MessageState.PENDING_DELETING_DRAFT
+                  } else {
+                    MessageState.PENDING_DELETING
+                  }
+                )
+              }
+            }
+            true
+          }
+
+          R.id.menuActionMoveToInbox -> {
+            threadDetailsViewModel.changeMsgState(MessageState.PENDING_MOVE_TO_INBOX)
+            true
+          }
+
+          R.id.menuActionMarkUnread -> {
+            threadDetailsViewModel.changeMsgState(MessageState.PENDING_MARK_UNREAD)
+            true
+          }
+
+          R.id.menuActionMoveToSpam -> {
+            threadDetailsViewModel.changeMsgState(MessageState.PENDING_MOVE_TO_SPAM)
+            true
+          }
+
+          R.id.menuActionMarkAsNotSpam -> {
+            threadDetailsViewModel.changeMsgState(MessageState.PENDING_MARK_AS_NOT_SPAM)
+            true
+          }
+
+          R.id.menuActionChangeLabels -> {
+            changeGmailLabels()
+            true
+          }
+
+          else -> false
+        }
+      }
+    }, viewLifecycleOwner, Lifecycle.State.RESUMED)
+  }
+
+  fun changeFragmentActiveState(isActive: Boolean) {
+    this.isActive = isActive
+
+    if (isActive) {
+      threadDetailsViewModel.messagesInThreadFlow.value.data?.let {
+        tryToOpenTheFreshestMessage(it.list)
+      }
+    }
+  }
+
+  private fun updateActionBar() {
+    supportActionBar?.title = null
+    supportActionBar?.subtitle = null
+  }
+
+  private fun initViews() {
+    binding?.layoutReplyButtons?.replyButton?.gone()
+    binding?.layoutReplyButtons?.replyAllButton?.gone()
+    binding?.layoutReplyButtons?.forwardButton?.gone()
+
+    binding?.recyclerViewMessages?.apply {
+      val linearLayoutManager = LinearLayoutManager(context)
+      layoutManager = linearLayoutManager
+      addItemDecoration(
+        SkipFirstAndLastDividerItemDecoration(context, linearLayoutManager.orientation)
+      )
+      adapter = messagesInThreadListAdapter
+    }
+
+    binding?.swipeRefreshLayout?.apply {
+      setColorSchemeResources(R.color.colorPrimary, R.color.colorPrimary, R.color.colorPrimary)
+      setOnRefreshListener { threadDetailsViewModel.loadMessages(silentUpdate = true) }
+    }
+  }
+
+  private fun setupThreadDetailsViewModel() {
+    launchAndRepeatWithViewLifecycle {
+      threadDetailsViewModel.messagesInThreadFlow.collect {
+        activity?.invalidateOptionsMenu()
+        binding?.swipeRefreshLayout?.isRefreshing = false
+
+        when (it.status) {
+          Result.Status.LOADING -> {
+            showProgress()
+          }
+
+          Result.Status.SUCCESS -> {
+            val items = it.data?.list
+            when {
+              items.isNullOrEmpty() -> {
+                if (it.data?.silentUpdate == true) {
+                  navController?.navigateUp()
+                  showStatus(getString(R.string.no_results)) {
+                    threadDetailsViewModel.loadMessages(clearCache = true)
+                  }
+                }
+              }
+
+              items.size == 1 -> {
+                threadDetailsViewModel.deleteThread()
+                navController?.navigateUp()
+              }
+
+              else -> {
+                binding?.swipeRefreshLayout?.isEnabled = true
+                messagesInThreadListAdapter.submitList(items)
+                showContent()
+                if (!it.data.silentUpdate) {
+                  tryToOpenTheFreshestMessage(items)
+                }
+              }
+            }
+          }
+
+          Result.Status.EXCEPTION -> {
+            val actionsForMissedThreadSituation = {
+              toast(getString(R.string.thread_was_deleted_or_moved))
+              navController?.navigateUp()
+              threadDetailsViewModel.deleteThread()
+            }
+
+            when (it.exception) {
+              is GoogleJsonResponseException -> if (
+                it.exception.details?.code == HttpURLConnection.HTTP_NOT_FOUND
+                && it.exception.details.errors?.any { errorInfo ->
+                  errorInfo.reason.equals("notFound", true)
+                } == true
+              ) {
+                if (isActive) {
+                  actionsForMissedThreadSituation.invoke()
+                  return@collect
+                }
+              }
+
+              is ThreadNotFoundException -> {
+                if (isActive) {
+                  actionsForMissedThreadSituation.invoke()
+                  return@collect
+                }
+              }
+            }
+
+            if (it.data?.silentUpdate == true) {
+              toast(it.exceptionMsg)
+            } else {
+              showStatus(it.exceptionMsg) {
+                threadDetailsViewModel.loadMessages(clearCache = true)
+              }
+            }
+          }
+
+          else -> {}
+        }
+      }
+    }
+
+    launchAndRepeatWithViewLifecycle {
+      threadDetailsViewModel.localFolderFlow.collect {
+        //do nothing. Just subscribe for updates to have the latest value async
+      }
+    }
+
+    launchAndRepeatWithViewLifecycle {
+      threadDetailsViewModel.allOutboxMessagesFlow.collect { messageEntities ->
+        val threadId =
+          threadDetailsViewModel.threadMessageEntityFlow.value?.threadId ?: return@collect
+        val draftsToBeDeletedInLocalCache = messageEntities.filter {
+          it.threadId == threadId && !it.draftId.isNullOrEmpty()
+        }
+
+        draftsToBeDeletedInLocalCache.forEach {
+          it.draftId?.let { draftId -> deleteDraftFromLocalCache(draftId) }
+        }
+      }
+    }
+
+    launchAndRepeatWithViewLifecycle {
+      threadDetailsViewModel.messageActionsAvailabilityStateFlow.collect {
+        activity?.invalidateOptionsMenu()
+      }
+    }
+
+    launchAndRepeatWithViewLifecycle {
+      threadDetailsViewModel.sessionMessageStateStateFlow.collect { newState ->
+        newState ?: return@collect //skip initial value
+
+        activity?.invalidateOptionsMenu()
+
+        var navigateUp = true
+        when (newState) {
+          MessageState.PENDING_ARCHIVING -> ArchiveMsgsWorker.enqueue(requireContext())
+          MessageState.PENDING_DELETING -> DeleteMessagesWorker.enqueue(requireContext())
+          MessageState.PENDING_DELETING_DRAFT -> DeleteDraftsWorker.enqueue(requireContext())
+          MessageState.PENDING_DELETING_PERMANENTLY -> DeleteMessagesPermanentlyWorker.enqueue(
+            requireContext()
+          )
+
+          MessageState.PENDING_MOVE_TO_INBOX -> MovingToInboxWorker.enqueue(requireContext())
+          MessageState.PENDING_MOVE_TO_SPAM -> MovingToSpamWorker.enqueue(requireContext())
+          MessageState.PENDING_MARK_AS_NOT_SPAM -> MarkAsNotSpamWorker.enqueue(requireContext())
+          MessageState.PENDING_MARK_UNREAD -> UpdateMsgsSeenStateWorker.enqueue(requireContext())
+          MessageState.PENDING_MARK_READ -> {
+            UpdateMsgsSeenStateWorker.enqueue(requireContext())
+            navigateUp = false
+          }
+
+          else -> {}
+        }
+
+        if (navigateUp) {
+          navController?.navigateUp()
+        }
+      }
+    }
+  }
+
+  private fun subscribeToTwoWayDialog() {
+    setFragmentResultListenerForTwoWayDialog(
+      requestKey = REQUEST_KEY_TWO_WAY_DIALOG_BASE + args.messageEntityId.toString(),
+      useSuperParentFragmentManagerIfPossible = args.isViewPagerMode
+    ) { _, bundle ->
+      val requestCode = bundle.getInt(TwoWayDialogFragment.KEY_REQUEST_CODE)
+      val result = bundle.getInt(TwoWayDialogFragment.KEY_RESULT)
+
+      when (requestCode) {
+        REQUEST_CODE_DELETE_MESSAGE_DIALOG -> if (result == TwoWayDialogFragment.RESULT_OK) {
+          threadDetailsViewModel.changeMsgState(MessageState.PENDING_DELETING_PERMANENTLY)
+        }
+
+        REQUEST_CODE_SHOW_WARNING_DIALOG_FOR_DOWNLOADING_DANGEROUS_FILE ->
+          if (result == TwoWayDialogFragment.RESULT_OK) {
+            bundle.getBundle(TwoWayDialogFragment.KEY_REQUEST_INCOMING_BUNDLE)
+              ?.let {
+                processActionForMessageAndAttachmentBasedOnIncomingBundle(it) { attachmentInfo, message ->
+                  processDownloadAttachment(attachmentInfo, message)
+                }
+              }
+          }
+
+        REQUEST_CODE_SHOW_TWO_WAY_DIALOG_FOR_DELETING_DRAFT ->
+          if (result == TwoWayDialogFragment.RESULT_OK) {
+            bundle.getBundle(TwoWayDialogFragment.KEY_REQUEST_INCOMING_BUNDLE)?.let {
+              processActionForMessageBasedOnIncomingBundle(it) { message ->
+                if (message.messageEntity.id != null) {
+                  showDialogFragment(navController) {
+                    object : NavDirections {
+                      override val actionId = R.id.delete_draft_dialog_graph
+                      override val arguments = DeleteDraftDialogFragmentArgs(
+                        requestKey = REQUEST_KEY_DELETE_DRAFT + args.messageEntityId.toString(),
+                        uniqueId = message.id,
+                        messageEntityId = message.messageEntity.id,
+                      ).toBundle()
+                    }
+                  }
+                }
+              }
+            }
+          }
+      }
+    }
+  }
+
+  private fun subscribeToProcessMessageDialogFragment() {
+    setFragmentResultListener(
+      requestKey = REQUEST_KEY_PROCESS_MESSAGE + args.messageEntityId.toString(),
+      useSuperParentFragmentManagerIfPossible = args.isViewPagerMode
+    ) { _, bundle ->
+      val message: MessagesInThreadListAdapter.Message? = bundle.getParcelableViaExt(
+        ProcessMessageDialogFragment.KEY_RESULT
+      ) as? MessagesInThreadListAdapter.Message?
+      val requestCode = bundle.getInt(ProcessMessageDialogFragment.KEY_REQUEST_CODE)
+      if (message != null) {
+        val hasUnverifiedSignatures =
+          message.incomingMessageInfo?.verificationResult?.hasUnverifiedSignatures ?: false
+        val hasActiveSignatureVerification = if (hasUnverifiedSignatures) {
+          val messageFromAddresses = message.incomingMessageInfo?.getFrom()?.map {
+            it.address.lowercase()
+          } ?: emptyList()
+
+          val alreadyCheckedFromAddresses =
+            threadDetailsViewModel.sessionFromRecipientsStateFlow.value.filter {
+              !it.isUpdating
+            }.map { it.recipientWithPubKeys.recipient.email }
+
+          if (alreadyCheckedFromAddresses.containsAll(messageFromAddresses)
+            || messageFromAddresses.isEmpty()
+          ) {
+            false
+          } else {
+            threadDetailsViewModel.fetchAndUpdateInfoAboutRecipients(messageFromAddresses)
+            true
+          }
+        } else {
+          false
+        }
+
+        val updatedMessage = message.copy(
+          type = MessagesInThreadListAdapter.Type.MESSAGE_EXPANDED,
+          attachments = message.attachments.map { attachmentInfo ->
+            if (attachmentInfo.rawData != null) {
+              EmbeddedAttachmentsProvider.Cache.getInstance().addAndGet(attachmentInfo)
+            } else {
+              attachmentInfo
+            }
+          },
+          hasActiveSignatureVerification = hasActiveSignatureVerification
+        )
+
+        threadDetailsViewModel.onMessageChanged(updatedMessage)
+
+        when (requestCode) {
+          REQUEST_CODE_PROCESS_ATTACHMENT_PREVIEW -> {
+            val attachmentId = bundle.getString(ProcessMessageDialogFragment.KEY_ATTACHMENT_ID)
+            updatedMessage.attachments.firstOrNull { it.path == attachmentId }
+              ?.let { attachmentInfo ->
+                handleAttachmentPreviewClick(attachmentInfo, updatedMessage)
+              }
+          }
+
+          REQUEST_CODE_PROCESS_ATTACHMENT_DOWNLOAD -> {
+            val attachmentId = bundle.getString(ProcessMessageDialogFragment.KEY_ATTACHMENT_ID)
+            updatedMessage.attachments.firstOrNull { it.path == attachmentId }
+              ?.let { attachmentInfo ->
+                processDownloadAttachment(attachmentInfo, updatedMessage)
+              }
+          }
+
+          REQUEST_CODE_PROCESS_AND_FORWARD -> {
+            forward(updatedMessage)
+          }
+
+          REQUEST_CODE_PROCESS_AND_REPLY -> {
+            replyTo(message)
+          }
+
+          REQUEST_CODE_PROCESS_AND_REPLY_ALL -> {
+            replyAllTo(message)
+          }
+        }
+      } else {
+        toast(R.string.unknown_error)
+      }
+    }
+  }
+
+  private fun subscribeToFixNeedPassphraseIssueDialogFragment() {
+    setFragmentResultListener(
+      requestKey = REQUEST_KEY_FIX_MISSING_PASSPHRASE + args.messageEntityId.toString(),
+      useSuperParentFragmentManagerIfPossible = args.isViewPagerMode
+    ) { _, bundle ->
+      val requestCode = bundle.getInt(
+        FixNeedPassphraseIssueDialogFragment.KEY_REQUEST_CODE, Int.MIN_VALUE
+      )
+
+      when (requestCode) {
+        REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_PROCESS_MESSAGE -> {
+          bundle.getBundle(FixNeedPassphraseIssueDialogFragment.KEY_REQUEST_INCOMING_BUNDLE)?.let {
+            processActionForMessageBasedOnIncomingBundle(it) { message ->
+              val actionRequestCode = it.getInt(KEY_EXTRA_REQUEST_CODE)
+              val attachmentId = it.getString(KEY_EXTRA_ATTACHMENT_ID)
+              processMessage(
+                message = message, requestCode = actionRequestCode, attachmentId = attachmentId
+              )
+            }
+          }
+        }
+
+        REQUEST_CODE_FIX_MISSING_PASSPHRASE_AFTER_PROCESS_MESSAGE -> {
+          bundle.getBundle(FixNeedPassphraseIssueDialogFragment.KEY_REQUEST_INCOMING_BUNDLE)?.let {
+            processActionForMessageBasedOnIncomingBundle(it) { message ->
+              processMessageClick(message = message, forceProcess = true)
+            }
+          }
+        }
+
+        REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_PREVIEW_ATTACHMENT -> {
+          bundle.getBundle(FixNeedPassphraseIssueDialogFragment.KEY_REQUEST_INCOMING_BUNDLE)?.let {
+            processActionForMessageAndAttachmentBasedOnIncomingBundle(it) { attachmentInfo, message ->
+              handleAttachmentPreviewClick(attachmentInfo, message)
+            }
+          }
+        }
+
+        REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_DOWNLOAD_ATTACHMENT -> {
+          bundle.getBundle(FixNeedPassphraseIssueDialogFragment.KEY_REQUEST_INCOMING_BUNDLE)?.let {
+            processActionForMessageAndAttachmentBasedOnIncomingBundle(it) { attachmentInfo, message ->
+              downloadAttachment(attachmentInfo, message)
+            }
+          }
+        }
+
+        REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_EDITING_DRAFT -> {
+          bundle.getBundle(FixNeedPassphraseIssueDialogFragment.KEY_REQUEST_INCOMING_BUNDLE)?.let {
+            processActionForMessageBasedOnIncomingBundle(it) { message ->
+              editDraft(message)
+            }
+          }
+        }
+
+        else -> toast(R.string.unknown_error)
+      }
+    }
+  }
+
+  private fun subscribeToDownloadAttachmentViaDialog() {
+    setFragmentResultListener(
+      REQUEST_KEY_DOWNLOAD_ATTACHMENT + args.messageEntityId.toString(),
+      args.isViewPagerMode
+    ) { _, bundle ->
+      val requestCode = bundle.getInt(DownloadAttachmentDialogFragment.KEY_REQUEST_CODE)
+
+      val attachmentInfo = bundle.getParcelableViaExt<AttachmentInfo>(
+        DownloadAttachmentDialogFragment.KEY_ATTACHMENT
+      )?.let { EmbeddedAttachmentsProvider.Cache.getInstance().addAndGet(it) }
+        ?: return@setFragmentResultListener
+
+      val message = bundle.getBundle(DownloadAttachmentDialogFragment.KEY_INCOMING_BUNDLE)?.getLong(
+        KEY_EXTRA_MESSAGE_ID
+      )?.let { messageId ->
+        messagesInThreadListAdapter.currentList.firstOrNull {
+          it.id == messageId
+        } as? MessagesInThreadListAdapter.Message
+      } ?: return@setFragmentResultListener
+
+      threadDetailsViewModel.onMessageChanged(
+        message.copy(
+          attachments = message.attachments.toMutableList().apply {
+            replaceAll {
+              if (it.id == attachmentInfo.id) {
+                attachmentInfo
+              } else {
+                it
+              }
+            }
+          }
+        )
+      )
+
+      when (requestCode) {
+        REQUEST_CODE_PREVIEW_ATTACHMENT -> {
+          previewAttachment(attachmentInfo)
+        }
+
+        REQUEST_CODE_SAVE_ATTACHMENT -> {
+          downloadAttachment(attachmentInfo = attachmentInfo, message = message)
+        }
+      }
+    }
+  }
+
+  private fun subscribeToDeleteDraftDialog() {
+    setFragmentResultListener(
+      REQUEST_KEY_DELETE_DRAFT + args.messageEntityId.toString(),
+      args.isViewPagerMode
+    ) { _, bundle ->
+      val uniqueMessageId = bundle.getLong(DeleteDraftDialogFragment.KEY_RESULT)
+
+      messagesInThreadListAdapter.getMessageItemById(uniqueMessageId)?.let {
+        threadDetailsViewModel.deleteMessageFromCache(it)
+      }
+    }
+  }
+
+  private fun subscribeToImportingAdditionalPrivateKeys() {
+    setFragmentResultListener(
+      REQUEST_KEY_IMPORT_ADDITIONAL_PRIVATE_KEYS + args.messageEntityId.toString(),
+      args.isViewPagerMode
+    ) { _, bundle ->
+      val keys = bundle.getParcelableArrayListViaExt<PgpKeyRingDetails>(
+        ImportAdditionalPrivateKeysFragment.KEY_IMPORTED_PRIVATE_KEYS
+      )
+      if (keys?.isNotEmpty() == true) {
+        toast(R.string.key_successfully_imported)
+        val message =
+          bundle.getBundle(ImportAdditionalPrivateKeysFragment.KEY_INCOMING_BUNDLE)?.getLong(
+            KEY_EXTRA_MESSAGE_ID
+          )?.let { messageId ->
+            messagesInThreadListAdapter.getMessageItemById(messageId)
+          } ?: return@setFragmentResultListener
+
+        processMessageClick(message = message, forceProcess = true)
+      }
+    }
+  }
+
+  private fun subscribeToChoosePublicKeyDialogFragment() {
+    setFragmentResultListener(
+      REQUEST_KEY_CHOOSE_PUBLIC_KEY + args.messageEntityId.toString(),
+      args.isViewPagerMode
+    ) { _, bundle ->
+      val keyList = bundle.getParcelableArrayListViaExt<AttachmentInfo>(
+        ChoosePublicKeyDialogFragment.KEY_ATTACHMENT_INFO_LIST
+      )?.map { attachmentInfo ->
+        attachmentInfo.copy(isProtected = true)
+      } ?: return@setFragmentResultListener
+      if (keyList.isNotEmpty()) {
+        val message =
+          bundle.getBundle(ChoosePublicKeyDialogFragment.KEY_INCOMING_BUNDLE)?.getLong(
+            KEY_EXTRA_MESSAGE_ID
+          )?.let { messageId ->
+            messagesInThreadListAdapter.getMessageItemById(messageId)
+          } ?: return@setFragmentResultListener
+        sendTemplateMsgWithPublicKey(message, keyList[0])
+      } else {
+        toast(R.string.account_has_no_associated_keys)
+      }
+    }
+  }
+
+  private fun subscribeToDecryptAttachmentViaDialog() {
+    setFragmentResultListener(
+      REQUEST_KEY_DECRYPT_ATTACHMENT + args.messageEntityId.toString(),
+      args.isViewPagerMode
+    ) { _, bundle ->
+      val attachmentInfo =
+        bundle.getParcelableViaExt<AttachmentInfo>(DecryptAttachmentDialogFragment.KEY_ATTACHMENT)
+          ?: return@setFragmentResultListener
+
+      previewAttachment(EmbeddedAttachmentsProvider.Cache.getInstance().addAndGet(attachmentInfo))
+    }
+  }
+
+  private fun subscribeToDraftsUpdates() {
+    launchAndRepeatWithViewLifecycle(Lifecycle.State.CREATED) {
+      WorkManager.getInstance(requireContext())
+        .getWorkInfosForUniqueWorkFlow(UploadDraftsWorker.GROUP_UNIQUE_TAG)
+        .collect { workInfoList ->
+          val workInfo = workInfoList.firstOrNull() ?: return@collect
+          val messageUID = workInfo.progress.getLong(UploadDraftsWorker.EXTRA_KEY_MESSAGE_UID, -1)
+          val threadId = workInfo.progress.getLong(UploadDraftsWorker.EXTRA_KEY_THREAD_ID, -1)
+          val state = workInfo.progress.getInt(UploadDraftsWorker.EXTRA_KEY_STATE, -1)
+          val currentThreadId = threadDetailsViewModel.threadMessageEntityFlow.value?.threadId
+
+          val message = messagesInThreadListAdapter.currentList.firstOrNull {
+            it is MessagesInThreadListAdapter.Message && it.messageEntity.uid == messageUID
+          } as? MessagesInThreadListAdapter.Message
+
+          when {
+            message != null -> {
+              when (state) {
+                UploadDraftsWorker.STATE_UPLOADING -> {
+                  threadDetailsViewModel.onMessageChanged(
+                    message.copy(hasActiveDraftUploadingProcess = true)
+                  )
+                }
+
+                UploadDraftsWorker.STATE_UPLOAD_COMPLETED -> {
+                  threadDetailsViewModel.loadMessages(
+                    silentUpdate = true,
+                    delayInMilliseconds = TimeUnit.SECONDS.toMillis(1)
+                  )
+                }
+              }
+            }
+
+            threadId == currentThreadId
+                && state == UploadDraftsWorker.STATE_UPLOAD_COMPLETED -> {
+              threadDetailsViewModel.loadMessages(
+                silentUpdate = true,
+                delayInMilliseconds = TimeUnit.SECONDS.toMillis(1)
+              )
+            }
+
+            state == UploadDraftsWorker.STATE_COMMON_UPLOAD_COMPLETED -> {
+              if (currentThreadId != null) {
+                val threadIdList =
+                  workInfo.progress.getLongArray(UploadDraftsWorker.EXTRA_KEY_THREAD_ID_LIST)
+                    ?: return@collect
+
+
+                if (currentThreadId in threadIdList) {
+                  threadDetailsViewModel.loadMessages(silentUpdate = true)
+                }
+              }
+            }
+          }
+        }
+    }
+
+    launchAndRepeatWithViewLifecycle(Lifecycle.State.CREATED) {
+      WorkManager.getInstance(requireContext())
+        .getWorkInfosForUniqueWorkFlow(MessagesSenderWorker.NAME)
+        .collect { workInfoList ->
+          val workInfo = workInfoList.firstOrNull() ?: return@collect
+          val threadIdOfSentMessage =
+            workInfo.progress.getLong(MessagesSenderWorker.EXTRA_KEY_THREAD_ID_OF_SENT_MESSAGE, -1)
+          val draftId = workInfo.progress.getString(MessagesSenderWorker.EXTRA_KEY_ID_OF_SENT_DRAFT)
+
+          if (!draftId.isNullOrEmpty()) {
+            deleteDraftFromLocalCache(draftId)
+          }
+
+          if (threadIdOfSentMessage != -1L) {
+            val currentThreadId = threadDetailsViewModel.threadMessageEntityFlow.value?.threadId
+            if (currentThreadId == threadIdOfSentMessage) {
+              threadDetailsViewModel.loadMessages(silentUpdate = true)
+            }
+          }
+        }
+    }
+  }
+
+  private fun deleteDraftFromLocalCache(draftId: String) {
+    val message = messagesInThreadListAdapter.currentList.firstOrNull {
+      it is MessagesInThreadListAdapter.Message && it.messageEntity.draftId == draftId
+    } as? MessagesInThreadListAdapter.Message
+
+    if (message != null) {
+      threadDetailsViewModel.deleteMessageFromCache(message)
+    }
+  }
+
+  private fun replyTo(message: MessagesInThreadListAdapter.Message) {
+    if (message.incomingMessageInfo != null) {
+      startActivity(prepareReply(message, MessageType.REPLY))
+    } else {
+      //we need to process the message before continue
+      processMessage(message = message, requestCode = REQUEST_CODE_PROCESS_AND_REPLY)
+    }
+  }
+
+  private fun replyAllTo(message: MessagesInThreadListAdapter.Message) {
+    if (message.incomingMessageInfo != null) {
+      startActivity(prepareReply(message, MessageType.REPLY_ALL))
+    } else {
+      //we need to process the message before continue
+      processMessage(message = message, requestCode = REQUEST_CODE_PROCESS_AND_REPLY_ALL)
+    }
+  }
+
+  private fun prepareReply(message: MessagesInThreadListAdapter.Message, replyType: Int) =
+    CreateMessageActivity.generateIntent(
+      context = context,
+      messageType = replyType,
+      msgEncryptionType = message.messageEntity.getMessageEncryptionType(),
+      msgInfo = message.incomingMessageInfo?.toReplyVersion(
+        requireContext(),
+        CONTENT_MAX_ALLOWED_LENGTH
+      )
+    )
+
+  private fun forward(message: MessagesInThreadListAdapter.Message) {
+    if (message.incomingMessageInfo == null) {
+      //we need to process the message before continue
+      processMessage(message = message, requestCode = REQUEST_CODE_PROCESS_AND_FORWARD)
+      return
+    }
+
+    if (message.attachments.none { it.isEmbeddedAndPossiblyEncrypted() || (it.isDecrypted && it.uri == null) }) {
+      startActivity(
+        CreateMessageActivity.generateIntent(
+          context = context,
+          messageType = MessageType.FORWARD,
+          msgEncryptionType = message.messageEntity.getMessageEncryptionType(),
+          msgInfo = message.incomingMessageInfo.toReplyVersion(
+            requireContext(),
+            CONTENT_MAX_ALLOWED_LENGTH
+          ),
+          attachments = (if (message.incomingMessageInfo.encryptionType == MessageEncryptionType.ENCRYPTED) {
+            message.attachments.map {
+              it.copy(
+                isLazyForwarded = !it.isEmbedded,
+                name = if (it.isPossiblyEncrypted) FilenameUtils.removeExtension(it.name) else it.name,
+                decryptWhenForward = it.isPossiblyEncrypted
+              )
+            }
+          } else {
+            message.attachments.map { it.copy(isLazyForwarded = !it.isEmbedded) }
+          }).toTypedArray()
+        )
+      )
+    } else {
+      //we need to process the message again and keep attachments in RAM for forwarding
+      processMessage(
+        message = message,
+        requestCode = REQUEST_CODE_PROCESS_AND_FORWARD,
+        attachmentId = REQUEST_CODE_PROCESS_AND_FORWARD.toString()
+      )
+    }
+  }
+
+  private fun tryToOpenTheFreshestMessage(data: List<MessagesInThreadListAdapter.Item>) {
+    if (isActive && data.size > 1) {
+      val hasProcessedMessages = data.any {
+        it is MessagesInThreadListAdapter.Message && it.incomingMessageInfo != null
+      }
+      val existing = messagesInThreadListAdapter.currentList.getOrNull(1)
+          as? MessagesInThreadListAdapter.Message
+      val lastMessage = data.lastOrNull() as? MessagesInThreadListAdapter.Message
+
+      if (!hasProcessedMessages && existing != null && existing.type == MessagesInThreadListAdapter.Type.MESSAGE_COLLAPSED
+        && existing.incomingMessageInfo == null
+      ) {
+        if (lastMessage != null && lastMessage.incomingMessageInfo == null) {
+          binding?.recyclerViewMessages?.layoutManager?.scrollToPosition(data.size - 1)
+          processMessageClick(lastMessage)
+        }
+      }
+    }
+  }
+
+  private fun processMessageClick(
+    message: MessagesInThreadListAdapter.Message,
+    forceProcess: Boolean = false
+  ) {
+    if (message.type == MessagesInThreadListAdapter.Type.MESSAGE_COLLAPSED || forceProcess) {
+      if (message.incomingMessageInfo == null || forceProcess) {
+        processMessage(message = message, requestCode = REQUEST_CODE_PROCESS_WHOLE_MESSAGE)
+      } else {
+        threadDetailsViewModel.onMessageClicked(message)
+      }
+    } else {
+      threadDetailsViewModel.onMessageClicked(message)
+    }
+  }
+
+  private fun changeGmailLabels() {
+    if (AccountEntity.ACCOUNT_TYPE_GOOGLE == account?.accountType) {
+      showDialogFragment(navController) {
+        object : NavDirections {
+          override val actionId = R.id.change_gmail_labels_for_single_message_dialog_graph
+          override val arguments = ChangeGmailLabelsDialogFragmentArgs(
+            requestKey = REQUEST_KEY_CHANGE_LABELS + args.messageEntityId.toString(),
+            messageEntityIds = arrayOf(args.messageEntityId).toLongArray()
+          ).toBundle()
+        }
+      }
+    }
+  }
+
+  private fun updateThreadReplyButtons(message: MessagesInThreadListAdapter.Message?) {
+    val replyButton = binding?.layoutReplyButtons?.replyButton
+    val replyAllButton = binding?.layoutReplyButtons?.replyAllButton
+    val forwardButton = binding?.layoutReplyButtons?.forwardButton
+
+    replyButton?.visibleOrGone(message != null)
+    replyAllButton?.visibleOrGone(message != null)
+    forwardButton?.visibleOrGone(message != null)
+
+    if (message == null) {
+      return
+    }
+
+    val buttonsColorId: Int
+
+    if (message.messageEntity.hasPgp == true) {
+      buttonsColorId = R.color.colorPrimary
+      replyButton?.setText(R.string.reply_encrypted)
+      replyAllButton?.setText(R.string.reply_all_encrypted)
+      forwardButton?.setText(R.string.forward_encrypted)
+    } else {
+      buttonsColorId = R.color.red
+      replyButton?.setText(R.string.reply)
+      replyAllButton?.setText(R.string.reply_all)
+      forwardButton?.setText(R.string.forward)
+    }
+
+    val colorStateList =
+      ColorStateList.valueOf(ContextCompat.getColor(requireContext(), buttonsColorId))
+
+    replyButton?.iconTint = colorStateList
+    replyAllButton?.iconTint = colorStateList
+    forwardButton?.iconTint = colorStateList
+
+    replyButton?.setOnClickListener { replyTo(message) }
+    replyAllButton?.setOnClickListener { replyAllTo(message) }
+    forwardButton?.setOnClickListener { forward(message) }
+  }
+
+  private fun handleAttachmentDownloadClick(
+    attachmentInfo: AttachmentInfo,
+    message: MessagesInThreadListAdapter.Message
+  ) {
+    when {
+      FilenameUtils.getExtension(attachmentInfo.getSafeName())
+        ?.lowercase() in AttachmentInfo.DANGEROUS_FILE_EXTENSIONS -> {
+        showTwoWayDialog(
+          requestKey = REQUEST_KEY_TWO_WAY_DIALOG_BASE + args.messageEntityId.toString(),
+          requestCode = REQUEST_CODE_SHOW_WARNING_DIALOG_FOR_DOWNLOADING_DANGEROUS_FILE,
+          dialogTitle = "",
+          dialogMsg = getString(R.string.download_dangerous_file_warning),
+          positiveButtonTitle = getString(R.string.continue_),
+          negativeButtonTitle = getString(android.R.string.cancel),
+          bundle = Bundle().apply {
+            putLong(KEY_EXTRA_MESSAGE_ID, message.id)
+            putString(KEY_EXTRA_ATTACHMENT_ID, attachmentInfo.uniqueStringId)
+          }
+        )
+      }
+
+      EmbeddedAttachmentsProvider.Cache.getInstance().getDocumentId(attachmentInfo) == null
+          && attachmentInfo.isDecrypted
+          && attachmentInfo.uri == null -> {
+        //need to process message again and store attachment in RAM cache
+        processMessage(
+          message = message,
+          requestCode = REQUEST_CODE_PROCESS_ATTACHMENT_DOWNLOAD,
+          attachmentId = attachmentInfo.path
+        )
+      }
+
+      else -> {
+        processDownloadAttachment(attachmentInfo, message)
+      }
+    }
+  }
+
+  private fun handleAttachmentPreviewClick(
+    attachmentInfo: AttachmentInfo,
+    message: MessagesInThreadListAdapter.Message
+  ) {
+    val documentId = EmbeddedAttachmentsProvider.Cache.getInstance().getDocumentId(attachmentInfo)
+    if (attachmentInfo.uri != null && documentId != null) {
+      if (attachmentInfo.isPossiblyEncrypted) {
+        val embeddedAttachmentsCache = EmbeddedAttachmentsProvider.Cache.getInstance()
+        val existingDocumentIdForDecryptedVersion = embeddedAttachmentsCache
+          .getDocumentId(attachmentInfo.copy(name = FilenameUtils.getBaseName(attachmentInfo.name)))
+
+        if (existingDocumentIdForDecryptedVersion != null) {
+          embeddedAttachmentsCache.getUriVersion(existingDocumentIdForDecryptedVersion)?.let {
+            previewAttachment(it)
+          }
+        } else {
+          if (!checkAndShowNeedPassphraseDialogIfNeeded(
+              attachmentInfo = attachmentInfo,
+              message = message,
+              requestCode = REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_PREVIEW_ATTACHMENT
+            )
+          ) {
+            navController?.navigate(
+              object : NavDirections {
+                override val actionId = R.id.decrypt_attachment_dialog_graph
+                override val arguments = DecryptAttachmentDialogFragmentArgs(
+                  attachmentInfo = attachmentInfo.copy(),
+                  requestKey = REQUEST_KEY_DECRYPT_ATTACHMENT + args.messageEntityId.toString(),
+                  requestCode = REQUEST_CODE_DECRYPT_ATTACHMENT,
+                  bundle = Bundle().apply {
+                    putLong(KEY_EXTRA_MESSAGE_ID, message.id)
+                    putString(KEY_EXTRA_ATTACHMENT_ID, attachmentInfo.uniqueStringId)
+                  }
+                ).toBundle()
+              }
+            )
+          }
+        }
+      } else {
+        previewAttachment(attachmentInfo)
+      }
+    } else {
+      when {
+        checkAndShowNeedPassphraseDialogIfNeeded(
+          attachmentInfo = attachmentInfo,
+          message = message,
+          requestCode = REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_PREVIEW_ATTACHMENT
+        ) -> return
+
+        attachmentInfo.isDecrypted && attachmentInfo.uri == null -> {
+          //need to process message again and store attachment in RAM cache
+          processMessage(
+            message = message,
+            requestCode = REQUEST_CODE_PROCESS_ATTACHMENT_PREVIEW,
+            attachmentId = attachmentInfo.path
+          )
+        }
+
+        else -> {
+          showDialogFragment(navController) {
+            object : NavDirections {
+              override val actionId = R.id.download_attachment_dialog_graph
+              override val arguments = DownloadAttachmentDialogFragmentArgs(
+                attachmentInfo = attachmentInfo,
+                requestKey = REQUEST_KEY_DOWNLOAD_ATTACHMENT + args.messageEntityId.toString(),
+                requestCode = REQUEST_CODE_PREVIEW_ATTACHMENT,
+                bundle = Bundle().apply {
+                  putLong(KEY_EXTRA_MESSAGE_ID, message.id)
+                }
+              ).toBundle()
+            }
+          }
+        }
+      }
+    }
+  }
+
+  private fun processMessage(
+    message: MessagesInThreadListAdapter.Message,
+    requestCode: Int,
+    attachmentId: String? = null
+  ) {
+    if (message.messageEntity.hasPgp == true) {
+      val keysStorage = KeysStorageImpl.getInstance(requireContext())
+      val fingerprints = keysStorage.getFingerprintsWithEmptyPassphrase()
+      if (fingerprints.isNotEmpty()) {
+        showNeedPassphraseDialog(
+          requestKey = REQUEST_KEY_FIX_MISSING_PASSPHRASE + args.messageEntityId.toString(),
+          requestCode = REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_PROCESS_MESSAGE,
+          fingerprints = fingerprints,
+          bundle = Bundle().apply {
+            putLong(KEY_EXTRA_MESSAGE_ID, message.id)
+            putInt(KEY_EXTRA_REQUEST_CODE, requestCode)
+            putString(KEY_EXTRA_ATTACHMENT_ID, attachmentId)
+          }
+        )
+        return
+      }
+    }
+
+    showDialogFragment(navController) {
+      object : NavDirections {
+        override val actionId = R.id.process_message_dialog_graph
+        override val arguments = ProcessMessageDialogFragmentArgs(
+          requestKey = REQUEST_KEY_PROCESS_MESSAGE + args.messageEntityId.toString(),
+          requestCode = requestCode,
+          message = message,
+          attachmentId = attachmentId
+        ).toBundle()
+      }
+    }
+  }
+
+  private fun previewAttachment(attachmentInfo: AttachmentInfo) {
+    val intent = if (attachmentInfo.uri != null) {
+      GeneralUtil.genViewAttachmentIntent(requireNotNull(attachmentInfo.uri), attachmentInfo)
+    } else {
+      toast(getString(R.string.preview_is_not_available))
+      return
+    }
+
+    if (account?.isHandlingAttachmentRestricted() == true) {
+      try {
+        startActivity(Intent(intent).setPackage(Constants.APP_PACKAGE_CONTENT_LOCKER))
+      } catch (e: ActivityNotFoundException) {
+        //We don't have the required app
+        showInfoDialog(
+          dialogTitle = "",
+          dialogMsg = getString(R.string.warning_don_not_have_content_app)
+        )
+      }
+    } else {
+      try {
+        startActivity(intent)
+      } catch (e: ActivityNotFoundException) {
+        toast(getString(R.string.no_apps_that_can_handle_intent))
+      }
+    }
+  }
+
+  private fun processDownloadAttachment(
+    attachmentInfo: AttachmentInfo,
+    message: MessagesInThreadListAdapter.Message
+  ) {
+    if (
+      checkAndShowNeedPassphraseDialogIfNeeded(
+        attachmentInfo = attachmentInfo,
+        message = message,
+        requestCode = REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_DOWNLOAD_ATTACHMENT
+      )
+    ) return
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ||
+      ContextCompat.checkSelfPermission(
+        requireContext(),
+        Manifest.permission.WRITE_EXTERNAL_STORAGE
+      ) == PackageManager.PERMISSION_GRANTED
+    ) {
+      downloadAttachment(attachmentInfo, message)
+    } else {
+      requestPermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    }
+  }
+
+  private fun downloadAttachment(
+    attachmentInfo: AttachmentInfo,
+    message: MessagesInThreadListAdapter.Message
+  ) {
+    val documentId = EmbeddedAttachmentsProvider.Cache.getInstance().getDocumentId(attachmentInfo)
+
+    when {
+      attachmentInfo.uri != null && documentId != null -> {
+        requireContext().startService(
+          AttachmentDownloadManagerService.newIntent(context = context, attInfo = attachmentInfo)
+        )
+      }
+
+      account?.isHandlingAttachmentRestricted() == true -> {
+        showDialogFragment(navController) {
+          object : NavDirections {
+            override val actionId = R.id.download_attachment_dialog_graph
+            override val arguments = DownloadAttachmentDialogFragmentArgs(
+              attachmentInfo = attachmentInfo,
+              requestKey = REQUEST_KEY_DOWNLOAD_ATTACHMENT + args.messageEntityId.toString(),
+              requestCode = REQUEST_CODE_SAVE_ATTACHMENT,
+              bundle = Bundle().apply {
+                putLong(KEY_EXTRA_MESSAGE_ID, message.id)
+              }
+            ).toBundle()
+          }
+        }
+      }
+
+      else -> {
+        requireContext().startService(
+          AttachmentDownloadManagerService.newIntent(context = context, attInfo = attachmentInfo)
+        )
+      }
+    }
+  }
+
+  private fun checkAndShowNeedPassphraseDialogIfNeeded(
+    attachmentInfo: AttachmentInfo,
+    message: MessagesInThreadListAdapter.Message,
+    requestCode: Int
+  ): Boolean {
+    if (attachmentInfo.isPossiblyEncrypted || attachmentInfo.isDecrypted) {
+      val keysStorage = KeysStorageImpl.getInstance(requireContext())
+      val fingerprints = keysStorage.getFingerprintsWithEmptyPassphrase()
+      if (fingerprints.isNotEmpty()) {
+        showNeedPassphraseDialog(
+          requestKey = REQUEST_KEY_FIX_MISSING_PASSPHRASE + args.messageEntityId.toString(),
+          requestCode = requestCode,
+          fingerprints = fingerprints,
+          bundle = Bundle().apply {
+            putLong(KEY_EXTRA_MESSAGE_ID, message.id)
+            putString(KEY_EXTRA_ATTACHMENT_ID, attachmentInfo.uniqueStringId)
+          }
+        )
+        return true
+      }
+    }
+    return false
+  }
+
+  private fun processActionForMessageAndAttachmentBasedOnIncomingBundle(
+    bundle: Bundle,
+    action: (AttachmentInfo, MessagesInThreadListAdapter.Message) -> Unit
+  ) {
+    val messageId = bundle.getLong(KEY_EXTRA_MESSAGE_ID, Long.MIN_VALUE)
+    val attachmentId = bundle.getString(KEY_EXTRA_ATTACHMENT_ID)
+    if (messageId > 0 && !attachmentId.isNullOrEmpty()) {
+      messagesInThreadListAdapter.getMessageItemById(messageId)?.let { message ->
+        val attachmentInfo = message.attachments.firstOrNull { attachmentInfo ->
+          attachmentInfo.uniqueStringId == attachmentId
+        } ?: return
+        action.invoke(attachmentInfo, message)
+      }
+    }
+  }
+
+  private fun processActionForMessageBasedOnIncomingBundle(
+    bundle: Bundle,
+    action: (MessagesInThreadListAdapter.Message) -> Unit
+  ) {
+    val messageId = bundle.getLong(KEY_EXTRA_MESSAGE_ID, Long.MIN_VALUE)
+    if (messageId > 0) {
+      messagesInThreadListAdapter.getMessageItemById(messageId)?.let { message ->
+        action.invoke(message)
+      }
+    }
+  }
+
+  private fun editDraft(message: MessagesInThreadListAdapter.Message) {
+    if (message.messageEntity.hasPgp == true) {
+      val keysStorage = KeysStorageImpl.getInstance(requireContext())
+      val fingerprints = keysStorage.getFingerprintsWithEmptyPassphrase()
+      if (fingerprints.isNotEmpty()) {
+        showNeedPassphraseDialog(
+          requestKey = REQUEST_KEY_FIX_MISSING_PASSPHRASE + args.messageEntityId.toString(),
+          requestCode = REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_EDITING_DRAFT,
+          fingerprints = fingerprints,
+          bundle = Bundle().apply {
+            putLong(KEY_EXTRA_MESSAGE_ID, message.id)
+          }
+        )
+        return
+      }
+    }
+
+    startActivity(
+      CreateMessageActivity.generateIntent(
+        context = context,
+        messageType = MessageType.DRAFT,
+        msgEncryptionType = message.messageEntity.getMessageEncryptionType(),
+        msgInfo = message.incomingMessageInfo?.toReplyVersion(
+          requireContext(),
+          CONTENT_MAX_ALLOWED_LENGTH
+        )
+      )
+    )
+  }
+
+  private fun deleteDraft(message: MessagesInThreadListAdapter.Message) {
+    showTwoWayDialog(
+      requestKey = REQUEST_KEY_TWO_WAY_DIALOG_BASE + args.messageEntityId.toString(),
+      requestCode = REQUEST_CODE_SHOW_TWO_WAY_DIALOG_FOR_DELETING_DRAFT,
+      dialogTitle = "",
+      dialogMsg = getString(R.string.delete_draft),
+      positiveButtonTitle = getString(R.string.delete),
+      negativeButtonTitle = getString(android.R.string.cancel),
+      bundle = Bundle().apply { putLong(KEY_EXTRA_MESSAGE_ID, message.id) }
+    )
+  }
+
+  private fun sendTemplateMsgWithPublicKey(
+    message: MessagesInThreadListAdapter.Message,
+    attachmentInfo: AttachmentInfo
+  ) {
+    startActivity(
+      CreateMessageActivity.generateIntent(
+        context = context,
+        messageType = MessageType.REPLY,
+        msgEncryptionType = MessageEncryptionType.STANDARD,
+        msgInfo = message.incomingMessageInfo?.toReplyVersion(
+          requireContext(),
+          CONTENT_MAX_ALLOWED_LENGTH
+        ),
+        serviceInfo = ServiceInfo(
+          isToFieldEditable = false,
+          isFromFieldEditable = false,
+          isMsgEditable = false,
+          isSubjectEditable = false,
+          isMsgTypeSwitchable = false,
+          hasAbilityToAddNewAtt = false,
+          systemMsg = getString(R.string.message_was_encrypted_for_wrong_key),
+          atts = listOf(attachmentInfo.copy(isProtected = true))
+        )
+      )
+    )
+  }
+
+  companion object {
+    private const val KEY_EXTRA_MESSAGE_ID = "MESSAGE_ID"
+    private const val KEY_EXTRA_ATTACHMENT_ID = "ATTACHMENT_ID"
+    private const val KEY_EXTRA_REQUEST_CODE = "REQUEST_CODE"
+
+    private val REQUEST_KEY_PROCESS_MESSAGE = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_PROCESS_MESSAGE",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_FIX_MISSING_PASSPHRASE = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_FIX_MISSING_PASSPHRASE",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_CHANGE_LABELS = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_CHANGE_LABELS",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_DOWNLOAD_ATTACHMENT = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_DOWNLOAD_ATTACHMENT",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_TWO_WAY_DIALOG_BASE = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_TWO_WAY_DIALOG_BASE",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_DELETE_DRAFT = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_DELETE_DRAFT",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_IMPORT_ADDITIONAL_PRIVATE_KEYS = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_IMPORT_ADDITIONAL_PRIVATE_KEYS",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_CHOOSE_PUBLIC_KEY = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_CHOOSE_PUBLIC_KEY",
+      ThreadDetailsFragment::class.java
+    )
+
+    private val REQUEST_KEY_DECRYPT_ATTACHMENT = GeneralUtil.generateUniqueExtraKey(
+      "REQUEST_KEY_DECRYPT_ATTACHMENT",
+      ThreadDetailsFragment::class.java
+    )
+
+    private const val REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_PROCESS_MESSAGE = 1000
+    private const val REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_PREVIEW_ATTACHMENT = 1001
+    private const val REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_DOWNLOAD_ATTACHMENT = 1002
+    private const val REQUEST_CODE_DELETE_MESSAGE_DIALOG = 1003
+    private const val REQUEST_CODE_SAVE_ATTACHMENT = 1004
+    private const val REQUEST_CODE_PREVIEW_ATTACHMENT = 1005
+    private const val REQUEST_CODE_DECRYPT_ATTACHMENT = 1006
+    private const val REQUEST_CODE_SHOW_WARNING_DIALOG_FOR_DOWNLOADING_DANGEROUS_FILE = 1007
+    private const val REQUEST_CODE_FIX_MISSING_PASSPHRASE_BEFORE_EDITING_DRAFT = 1008
+    private const val REQUEST_CODE_SHOW_TWO_WAY_DIALOG_FOR_DELETING_DRAFT = 1009
+    private const val REQUEST_CODE_PROCESS_WHOLE_MESSAGE = 1010
+    private const val REQUEST_CODE_PROCESS_ATTACHMENT_DOWNLOAD = 1011
+    private const val REQUEST_CODE_PROCESS_ATTACHMENT_PREVIEW = 1012
+    private const val REQUEST_CODE_FIX_MISSING_PASSPHRASE_AFTER_PROCESS_MESSAGE = 1013
+    private const val REQUEST_CODE_PROCESS_AND_REPLY = 1014
+    private const val REQUEST_CODE_PROCESS_AND_REPLY_ALL = 1015
+    private const val REQUEST_CODE_PROCESS_AND_FORWARD = 1016
+
+    private const val CONTENT_MAX_ALLOWED_LENGTH = 50000
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ViewPagerMessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ViewPagerMessageDetailsFragment.kt
index 6517e334d5..ac41717fba 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ViewPagerMessageDetailsFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ViewPagerMessageDetailsFragment.kt
@@ -27,18 +27,17 @@ import com.flowcrypt.email.databinding.FragmentViewPagerMessageDetailsBinding
 import com.flowcrypt.email.extensions.androidx.fragment.app.navController
 import com.flowcrypt.email.extensions.androidx.fragment.app.supportActionBar
 import com.flowcrypt.email.extensions.androidx.fragment.app.toast
+import com.flowcrypt.email.extensions.androidx.viewpager2.widget.reduceDragSensitivity
 import com.flowcrypt.email.extensions.observeOnce
 import com.flowcrypt.email.jetpack.lifecycle.CustomAndroidViewModelFactory
 import com.flowcrypt.email.jetpack.viewmodel.MessagesViewPagerViewModel
 import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
-import com.flowcrypt.email.ui.activity.fragment.base.ProgressBehaviour
-import com.flowcrypt.email.ui.adapter.FragmentsAdapter
+import com.flowcrypt.email.ui.adapter.MessageDetailsFragmentsAdapter
 
 /**
  * @author Denys Bondarenko
  */
-class ViewPagerMessageDetailsFragment : BaseFragment<FragmentViewPagerMessageDetailsBinding>(),
-  ProgressBehaviour {
+class ViewPagerMessageDetailsFragment : BaseFragment<FragmentViewPagerMessageDetailsBinding>() {
   private val args by navArgs<ViewPagerMessageDetailsFragmentArgs>()
 
   private val messagesViewPagerViewModel: MessagesViewPagerViewModel by viewModels {
@@ -54,13 +53,6 @@ class ViewPagerMessageDetailsFragment : BaseFragment<FragmentViewPagerMessageDet
     }
   }
 
-  override val progressView: View?
-    get() = binding?.progress?.root
-  override val contentView: View?
-    get() = binding?.viewPager2
-  override val statusView: View?
-    get() = binding?.status?.root
-
   override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
     FragmentViewPagerMessageDetailsBinding.inflate(inflater, container, false)
 
@@ -71,13 +63,12 @@ class ViewPagerMessageDetailsFragment : BaseFragment<FragmentViewPagerMessageDet
     supportActionBar?.subtitle = null
 
     binding?.viewPager2?.apply {
-      adapter = FragmentsAdapter(
+      reduceDragSensitivity()
+      adapter = MessageDetailsFragmentsAdapter(
         localFolder = args.localFolder,
         initialList = messagesViewPagerViewModel.messageEntitiesLiveData.value?.data ?: emptyList(),
         fragment = this@ViewPagerMessageDetailsFragment
-      ) { _, _ ->
-        showContent()
-      }
+      ) { _, _ -> }
 
       addItemDecoration(DividerItemDecoration(view.context, ORIENTATION_HORIZONTAL))
 
@@ -85,7 +76,7 @@ class ViewPagerMessageDetailsFragment : BaseFragment<FragmentViewPagerMessageDet
       registerOnPageChangeCallback(object : OnPageChangeCallback() {
         override fun onPageSelected(position: Int) {
           super.onPageSelected(position)
-          (adapter as FragmentsAdapter).getItem(position)?.let { messageEntity ->
+          (adapter as MessageDetailsFragmentsAdapter).getItem(position)?.let { messageEntity ->
             messagesViewPagerViewModel.onItemSelected(messageEntity)
           }
         }
@@ -119,8 +110,9 @@ class ViewPagerMessageDetailsFragment : BaseFragment<FragmentViewPagerMessageDet
     messagesViewPagerViewModel.initialLiveData.observeOnce(viewLifecycleOwner) {
       when (it.status) {
         Result.Status.SUCCESS -> {
-          (binding?.viewPager2?.adapter as? FragmentsAdapter)?.submit(it.data ?: emptyList())
-          showContent()
+          (binding?.viewPager2?.adapter as? MessageDetailsFragmentsAdapter)?.submit(
+            it.data ?: emptyList()
+          )
         }
 
         else -> {
@@ -133,8 +125,9 @@ class ViewPagerMessageDetailsFragment : BaseFragment<FragmentViewPagerMessageDet
     messagesViewPagerViewModel.messageEntitiesLiveData.observe(viewLifecycleOwner) {
       when (it.status) {
         Result.Status.SUCCESS -> {
-          (binding?.viewPager2?.adapter as? FragmentsAdapter)?.submit(it.data ?: emptyList())
-          showContent()
+          (binding?.viewPager2?.adapter as? MessageDetailsFragmentsAdapter)?.submit(
+            it.data ?: emptyList()
+          )
         }
 
         else -> {}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ViewPagerThreadDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ViewPagerThreadDetailsFragment.kt
new file mode 100644
index 0000000000..b192a34745
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ViewPagerThreadDetailsFragment.kt
@@ -0,0 +1,152 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.MenuHost
+import androidx.core.view.MenuProvider
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModel
+import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.viewpager2.widget.ViewPager2.ORIENTATION_HORIZONTAL
+import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.databinding.FragmentViewPagerThreadDetailsBinding
+import com.flowcrypt.email.extensions.androidx.fragment.app.navController
+import com.flowcrypt.email.extensions.androidx.fragment.app.supportActionBar
+import com.flowcrypt.email.extensions.androidx.fragment.app.toast
+import com.flowcrypt.email.extensions.androidx.viewpager2.widget.reduceDragSensitivity
+import com.flowcrypt.email.extensions.observeOnce
+import com.flowcrypt.email.jetpack.lifecycle.CustomAndroidViewModelFactory
+import com.flowcrypt.email.jetpack.viewmodel.ThreadsViewPagerViewModel
+import com.flowcrypt.email.providers.EmbeddedAttachmentsProvider
+import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
+import com.flowcrypt.email.ui.adapter.ThreadDetailsFragmentsAdapter
+
+/**
+ * @author Denys Bondarenko
+ */
+class ViewPagerThreadDetailsFragment : BaseFragment<FragmentViewPagerThreadDetailsBinding>() {
+  private val args by navArgs<ViewPagerThreadDetailsFragmentArgs>()
+
+  private val threadsViewPagerViewModel: ThreadsViewPagerViewModel by viewModels {
+    object : CustomAndroidViewModelFactory(requireActivity().application) {
+      @Suppress("UNCHECKED_CAST")
+      override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return ThreadsViewPagerViewModel(
+          initialMessageEntityId = args.messageEntityId,
+          localFolder = args.localFolder,
+          application = requireActivity().application
+        ) as T
+      }
+    }
+  }
+
+  override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+    FragmentViewPagerThreadDetailsBinding.inflate(inflater, container, false)
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    //need to clear action bar titles
+    supportActionBar?.title = null
+    supportActionBar?.subtitle = null
+
+    binding?.viewPager2?.apply {
+      reduceDragSensitivity()
+      adapter = ThreadDetailsFragmentsAdapter(
+        localFolder = args.localFolder,
+        initialList = threadsViewPagerViewModel.messageEntitiesLiveData.value?.data ?: emptyList(),
+        fragment = this@ViewPagerThreadDetailsFragment
+      ) { _, _ -> }
+
+      addItemDecoration(DividerItemDecoration(view.context, ORIENTATION_HORIZONTAL))
+
+      setOffscreenPageLimit(1)
+      registerOnPageChangeCallback(object : OnPageChangeCallback() {
+        override fun onPageSelected(position: Int) {
+          super.onPageSelected(position)
+          (adapter as ThreadDetailsFragmentsAdapter).getItem(position)?.let { messageEntity ->
+            threadsViewPagerViewModel.onItemSelected(messageEntity)
+            val activeFragment = childFragmentManager.fragments.firstOrNull {
+              messageEntity.id == it.navArgs<ThreadDetailsFragmentArgs>().value.messageEntityId
+            }?.apply {
+              (this as? ThreadDetailsFragment)?.changeFragmentActiveState(true)
+            }
+            val childFragmentsExceptSelected = childFragmentManager.fragments - activeFragment
+            childFragmentsExceptSelected.forEach {
+              (it as? ThreadDetailsFragment)?.changeFragmentActiveState(false)
+            }
+          }
+        }
+      })
+    }
+
+    setupThreadsViewPagerViewModel()
+  }
+
+  override fun onDestroyView() {
+    binding?.viewPager2?.adapter = null
+    super.onDestroyView()
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    EmbeddedAttachmentsProvider.Cache.getInstance().clear()
+  }
+
+  /*
+   * we have to define this code to manage action bar items
+   * for [ThreadDetailsFragment] automatically
+   */
+  override fun onSetupActionBarMenu(menuHost: MenuHost) {
+    super.onSetupActionBarMenu(menuHost)
+    menuHost.addMenuProvider(object : MenuProvider {
+      override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        menuInflater.inflate(R.menu.fragment_thread_details, menu)
+      }
+
+      override fun onMenuItemSelected(menuItem: MenuItem): Boolean = false
+    }, viewLifecycleOwner, Lifecycle.State.RESUMED)
+  }
+
+  private fun setupThreadsViewPagerViewModel() {
+    threadsViewPagerViewModel.initialLiveData.observeOnce(viewLifecycleOwner) {
+      when (it.status) {
+        Result.Status.SUCCESS -> {
+          (binding?.viewPager2?.adapter as? ThreadDetailsFragmentsAdapter)?.submit(
+            it.data ?: emptyList()
+          )
+        }
+
+        else -> {
+          toast(R.string.message_not_found)
+          navController?.navigateUp()
+        }
+      }
+    }
+
+    threadsViewPagerViewModel.messageEntitiesLiveData.observe(viewLifecycleOwner) {
+      when (it.status) {
+        Result.Status.SUCCESS -> {
+          (binding?.viewPager2?.adapter as? ThreadDetailsFragmentsAdapter)?.submit(
+            it.data ?: emptyList()
+          )
+        }
+
+        else -> {}
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ListProgressBehaviour.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ListProgressBehaviour.kt
index a4ad76b785..1a596589f1 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ListProgressBehaviour.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ListProgressBehaviour.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment.base
@@ -9,6 +9,8 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.flowcrypt.email.R
+import com.flowcrypt.email.extensions.gone
+import com.flowcrypt.email.extensions.visible
 
 /**
  * This interface helps to show a list of some data. It extends [ProgressBehaviour] with one more
@@ -19,23 +21,31 @@ import com.flowcrypt.email.R
 interface ListProgressBehaviour : ProgressBehaviour {
   val emptyView: View?
 
-  override fun showProgress(progressMsg: String?) {
-    emptyView?.visibility = View.GONE
-    super.showProgress(progressMsg)
+  override fun showProgress(
+    progressMsg: String?,
+    useHorizontalProgressBar: Boolean,
+    progress: Int
+  ) {
+    emptyView?.gone()
+    super.showProgress(
+      progressMsg = progressMsg,
+      useHorizontalProgressBar = useHorizontalProgressBar,
+      progress = progress
+    )
   }
 
   override fun showContent() {
-    emptyView?.visibility = View.GONE
+    emptyView?.gone()
     super.showContent()
   }
 
-  override fun showStatus(msg: String?, resourcesId: Int) {
-    emptyView?.visibility = View.GONE
-    super.showStatus(msg, resourcesId)
+  override fun showStatus(msg: String?, resourcesId: Int, action: (() -> Unit)?) {
+    emptyView?.gone()
+    super.showStatus(msg, resourcesId, action)
   }
 
   fun showEmptyView(msg: String? = null, imageResourcesId: Int = 0) {
-    contentView?.visibility = View.GONE
+    contentView?.gone()
     goneStatusView()
     goneProgressView()
 
@@ -49,7 +59,7 @@ interface ListProgressBehaviour : ProgressBehaviour {
       iVEmptyImg?.setImageResource(imageResourcesId)
     }
 
-    emptyView?.visibility = View.VISIBLE
+    emptyView?.visible()
   }
 
   fun updateEmptyViewText(msg: String?) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ProgressBehaviour.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ProgressBehaviour.kt
index 53a54bc49f..1ca115687c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ProgressBehaviour.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/ProgressBehaviour.kt
@@ -1,16 +1,18 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment.base
 
 import android.view.View
 import android.widget.ImageView
+import android.widget.ProgressBar
 import android.widget.TextView
 import com.flowcrypt.email.R
 import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.visible
+import com.flowcrypt.email.extensions.visibleOrGone
 
 /**
  * This interface describes a situation when we should to show some progress while some operation
@@ -24,13 +26,33 @@ interface ProgressBehaviour {
   val contentView: View?
   val statusView: View?
 
-  fun showProgress(progressMsg: String? = null) {
+  fun showProgress(
+    progressMsg: String? = null,
+    useHorizontalProgressBar: Boolean = false,
+    progress: Int = 0
+  ) {
     contentView?.gone()
     goneStatusView()
 
     val tVProgressMsg = progressView?.findViewById<TextView>(R.id.tVProgressMsg)
     tVProgressMsg?.text = progressMsg
 
+    val progressBar = progressView?.findViewById<ProgressBar>(R.id.progressBar)
+    val progressBarHorizontal = progressView?.findViewById<ProgressBar>(R.id.progressBarHorizontal)
+
+    progressBar?.visibleOrGone(!useHorizontalProgressBar)
+    progressBarHorizontal?.visibleOrGone(useHorizontalProgressBar)
+
+    if (useHorizontalProgressBar) {
+      if (progress > 0) {
+        progressBarHorizontal?.isIndeterminate = false
+        progressBarHorizontal?.progress = progress
+      } else {
+        progressBarHorizontal?.isIndeterminate = true
+        progressBarHorizontal?.progress = 0
+      }
+    }
+
     progressView?.visible()
   }
 
@@ -40,7 +62,11 @@ interface ProgressBehaviour {
     contentView?.visible()
   }
 
-  fun showStatus(msg: String? = null, resourcesId: Int = R.drawable.ic_warning_red_24dp) {
+  fun showStatus(
+    msg: String? = null,
+    resourcesId: Int = R.drawable.ic_warning_red_24dp,
+    action: (() -> Unit)? = null
+  ) {
     goneProgressView()
     contentView?.gone()
 
@@ -52,6 +78,15 @@ interface ProgressBehaviour {
       iVStatusImg?.setImageResource(resourcesId)
     }
 
+    if (action != null) {
+      statusView?.findViewById<View>(R.id.buttonRetry)?.apply {
+        visible()
+        setOnClickListener {
+          action.invoke()
+        }
+      }
+    }
+
     statusView?.visible()
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ChoosePublicKeyDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ChoosePublicKeyDialogFragment.kt
index 390c38f264..882e22167c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ChoosePublicKeyDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ChoosePublicKeyDialogFragment.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment.dialog
@@ -25,11 +25,11 @@ import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
 import com.flowcrypt.email.extensions.androidx.fragment.app.countingIdlingResource
+import com.flowcrypt.email.extensions.androidx.fragment.app.navController
+import com.flowcrypt.email.extensions.androidx.fragment.app.toast
 import com.flowcrypt.email.extensions.decrementSafely
 import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.incrementSafely
-import com.flowcrypt.email.extensions.androidx.fragment.app.navController
-import com.flowcrypt.email.extensions.androidx.fragment.app.toast
 import com.flowcrypt.email.jetpack.viewmodel.PrivateKeysViewModel
 import com.flowcrypt.email.security.model.PgpKeyRingDetails
 import com.flowcrypt.email.ui.adapter.PubKeysArrayAdapter
@@ -193,7 +193,10 @@ class ChoosePublicKeyDialogFragment : BaseDialogFragment(), View.OnClickListener
   private fun sendResult(atts: MutableList<AttachmentInfo>) {
     setFragmentResult(
       args.requestKey,
-      bundleOf(KEY_ATTACHMENT_INFO_LIST to atts)
+      bundleOf(
+        KEY_ATTACHMENT_INFO_LIST to atts,
+        KEY_INCOMING_BUNDLE to args.bundle
+      )
     )
   }
 
@@ -226,5 +229,9 @@ class ChoosePublicKeyDialogFragment : BaseDialogFragment(), View.OnClickListener
         "KEY_ATTACHMENT_INFO_LIST",
         ChoosePublicKeyDialogFragment::class.java
       )
+
+    val KEY_INCOMING_BUNDLE = GeneralUtil.generateUniqueExtraKey(
+      "KEY_INCOMING_BUNDLE", ChoosePublicKeyDialogFragment::class.java
+    )
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DecryptAttachmentDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DecryptAttachmentDialogFragment.kt
index 46ad7002df..97e7e227f8 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DecryptAttachmentDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DecryptAttachmentDialogFragment.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment.dialog
@@ -10,7 +10,6 @@ import android.os.Bundle
 import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.webkit.MimeTypeMap
 import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
@@ -20,13 +19,15 @@ import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.databinding.FragmentDecryptAttachmentBinding
+import com.flowcrypt.email.extensions.androidx.fragment.app.navController
 import com.flowcrypt.email.extensions.exceptionMsg
 import com.flowcrypt.email.extensions.invisible
+import com.flowcrypt.email.extensions.kotlin.getPossibleAndroidMimeType
 import com.flowcrypt.email.extensions.launchAndRepeatWithLifecycle
-import com.flowcrypt.email.extensions.androidx.fragment.app.navController
 import com.flowcrypt.email.extensions.visible
 import com.flowcrypt.email.jetpack.lifecycle.CustomAndroidViewModelFactory
 import com.flowcrypt.email.jetpack.viewmodel.DecryptAttachmentViewModel
+import com.flowcrypt.email.util.GeneralUtil
 import org.apache.commons.io.FilenameUtils
 
 /**
@@ -98,13 +99,12 @@ class DecryptAttachmentDialogFragment : BaseDialogFragment() {
                 bundleOf(
                   KEY_ATTACHMENT to args.attachmentInfo.copy(
                     uri = null,
-                    type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
-                      FilenameUtils.getExtension(newFileName).lowercase()
-                    ) ?: args.attachmentInfo.type,
+                    type = newFileName.getPossibleAndroidMimeType() ?: args.attachmentInfo.type,
                     rawData = byteArray,
                     name = newFileName
                   ),
-                  KEY_REQUEST_CODE to args.requestCode
+                  KEY_REQUEST_CODE to args.requestCode,
+                  KEY_INCOMING_BUNDLE to args.bundle
                 )
               )
             }
@@ -125,6 +125,9 @@ class DecryptAttachmentDialogFragment : BaseDialogFragment() {
 
   companion object {
     const val KEY_ATTACHMENT = "KEY_ATTACHMENT"
+    val KEY_INCOMING_BUNDLE = GeneralUtil.generateUniqueExtraKey(
+      "KEY_INCOMING_BUNDLE", DecryptAttachmentDialogFragment::class.java
+    )
     const val KEY_REQUEST_CODE = "KEY_REQUEST_CODE"
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DeleteDraftDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DeleteDraftDialogFragment.kt
new file mode 100644
index 0000000000..fa64caa868
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DeleteDraftDialogFragment.kt
@@ -0,0 +1,128 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment.dialog
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModel
+import androidx.navigation.fragment.navArgs
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.databinding.FragmentDeleteDraftBinding
+import com.flowcrypt.email.extensions.androidx.fragment.app.navController
+import com.flowcrypt.email.extensions.exceptionMsg
+import com.flowcrypt.email.extensions.gone
+import com.flowcrypt.email.extensions.launchAndRepeatWithLifecycle
+import com.flowcrypt.email.extensions.visible
+import com.flowcrypt.email.jetpack.lifecycle.CustomAndroidViewModelFactory
+import com.flowcrypt.email.jetpack.viewmodel.DeleteDraftViewModel
+import com.flowcrypt.email.ui.activity.fragment.base.ProgressBehaviour
+
+/**
+ * @author Denys Bondarenko
+ */
+class DeleteDraftDialogFragment : BaseDialogFragment(), ProgressBehaviour {
+  private var binding: FragmentDeleteDraftBinding? = null
+  private val args by navArgs<DeleteDraftDialogFragmentArgs>()
+  private val deleteDraftViewModel: DeleteDraftViewModel by viewModels {
+    object : CustomAndroidViewModelFactory(requireActivity().application) {
+      @Suppress("UNCHECKED_CAST")
+      override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return DeleteDraftViewModel(
+          args.messageEntityId,
+          requireActivity().application
+        ) as T
+      }
+    }
+  }
+
+  override val progressView: View?
+    get() = binding?.layoutProgress?.root
+  override val contentView: View?
+    get() = null
+  override val statusView: View?
+    get() = binding?.status?.root
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    isCancelable = false
+    collectDeleteDraftStateFlow()
+  }
+
+  override fun onStart() {
+    super.onStart()
+    getButton(AlertDialog.BUTTON_POSITIVE)?.apply {
+      setOnClickListener {
+        deleteDraftViewModel.retry()
+        gone()
+      }
+      //we hide the button at the start up.
+      gone()
+    }
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    binding = FragmentDeleteDraftBinding.inflate(
+      LayoutInflater.from(requireContext()),
+      if ((view != null) and (view is ViewGroup)) view as ViewGroup? else null,
+      false
+    )
+
+    val builder = AlertDialog.Builder(requireContext()).apply {
+      setView(binding?.root)
+
+      setNegativeButton(R.string.cancel) { _, _ ->
+        navController?.navigateUp()
+      }
+
+      setPositiveButton(R.string.retry) { _, _ -> }
+    }
+
+    return builder.create()
+  }
+
+  private fun collectDeleteDraftStateFlow() {
+    launchAndRepeatWithLifecycle {
+      deleteDraftViewModel.deleteDraftResultFlow.collect {
+        when (it.status) {
+          Result.Status.LOADING -> {
+            showProgress(progressMsg = it.progressMsg)
+          }
+
+          Result.Status.SUCCESS -> {
+            navController?.navigateUp()
+            setFragmentResult(
+              args.requestKey,
+              bundleOf(
+                KEY_REQUEST_KEY to args.requestKey,
+                KEY_RESULT to args.uniqueId,
+              )
+            )
+          }
+
+          Result.Status.EXCEPTION -> {
+            showStatus(msg = it.exceptionMsg)
+            (dialog as? AlertDialog)?.getButton(AlertDialog.BUTTON_POSITIVE)?.visible()
+          }
+
+          else -> {}
+        }
+      }
+    }
+  }
+
+  companion object {
+    const val KEY_RESULT = "KEY_RESULT"
+    const val KEY_REQUEST_KEY = "KEY_REQUEST_CODE"
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DownloadAttachmentDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DownloadAttachmentDialogFragment.kt
index 87895dad17..2f2842d8db 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DownloadAttachmentDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/DownloadAttachmentDialogFragment.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment.dialog
@@ -20,15 +20,15 @@ import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.databinding.FragmentDownloadAttachmentBinding
 import com.flowcrypt.email.extensions.androidx.fragment.app.countingIdlingResource
+import com.flowcrypt.email.extensions.androidx.fragment.app.navController
 import com.flowcrypt.email.extensions.decrementSafely
 import com.flowcrypt.email.extensions.incrementSafely
 import com.flowcrypt.email.extensions.invisible
+import com.flowcrypt.email.extensions.kotlin.getPossibleAndroidMimeType
 import com.flowcrypt.email.extensions.launchAndRepeatWithLifecycle
-import com.flowcrypt.email.extensions.androidx.fragment.app.navController
 import com.flowcrypt.email.extensions.visible
 import com.flowcrypt.email.jetpack.lifecycle.CustomAndroidViewModelFactory
 import com.flowcrypt.email.jetpack.viewmodel.DownloadAttachmentViewModel
-import com.flowcrypt.email.security.SecurityUtils
 import org.apache.commons.io.FilenameUtils
 
 /**
@@ -94,19 +94,36 @@ class DownloadAttachmentDialogFragment : BaseDialogFragment() {
 
           Result.Status.SUCCESS -> {
             navController?.navigateUp()
+            val finalName = if (args.attachmentInfo.isPossiblyEncrypted) {
+              /*
+               We need to drop the last extension section in the final result
+               as we return a decrypted file here.
+               */
+              FilenameUtils.getBaseName(args.attachmentInfo.name)
+            } else {
+              args.attachmentInfo.name
+            }
+
             it.data?.let { byteArray ->
               setFragmentResult(
                 args.requestKey,
                 bundleOf(
                   KEY_ATTACHMENT to args.attachmentInfo.copy(
                     rawData = byteArray,
-                    name = if (SecurityUtils.isPossiblyEncryptedData(args.attachmentInfo.name)) {
-                      FilenameUtils.getBaseName(args.attachmentInfo.name)
+                    name = finalName,
+                    type = if (args.attachmentInfo.isPossiblyEncrypted) {
+                      /*
+                       We need to specify a new MIME type based on the new attachment name
+                       after decryption. It will help the Android system use a right app
+                       to open this attachment.
+                      */
+                      finalName.getPossibleAndroidMimeType() ?: args.attachmentInfo.type
                     } else {
-                      args.attachmentInfo.name
-                    }
+                      args.attachmentInfo.type
+                    },
                   ),
-                  KEY_REQUEST_CODE to args.requestCode
+                  KEY_REQUEST_CODE to args.requestCode,
+                  KEY_INCOMING_BUNDLE to args.bundle
                 )
               )
             }
@@ -134,5 +151,6 @@ class DownloadAttachmentDialogFragment : BaseDialogFragment() {
   companion object {
     const val KEY_ATTACHMENT = "KEY_ATTACHMENT"
     const val KEY_REQUEST_CODE = "KEY_REQUEST_CODE"
+    const val KEY_INCOMING_BUNDLE = "KEY_INCOMING_BUNDLE"
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/FixNeedPassphraseIssueDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/FixNeedPassphraseIssueDialogFragment.kt
index 55a8f86fa5..2d086c803d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/FixNeedPassphraseIssueDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/FixNeedPassphraseIssueDialogFragment.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.activity.fragment.dialog
@@ -255,7 +255,8 @@ class FixNeedPassphraseIssueDialogFragment : BaseDialogFragment() {
                       bundleOf(
                         KEY_RESULT to unlockedKeysFingerprints.toTypedArray(),
                         KEY_PREDEFINED_FINGERPRINTS to args.fingerprints,
-                        KEY_REQUEST_CODE to args.requestCode
+                        KEY_REQUEST_CODE to args.requestCode,
+                        KEY_REQUEST_INCOMING_BUNDLE to args.bundle
                       )
                     )
                   }
@@ -268,7 +269,8 @@ class FixNeedPassphraseIssueDialogFragment : BaseDialogFragment() {
                     bundleOf(
                       KEY_RESULT to unlockedKeysFingerprints.toTypedArray(),
                       KEY_PREDEFINED_FINGERPRINTS to args.fingerprints,
-                      KEY_REQUEST_CODE to args.requestCode
+                      KEY_REQUEST_CODE to args.requestCode,
+                      KEY_REQUEST_INCOMING_BUNDLE to args.bundle
                     )
                   )
                 }
@@ -349,5 +351,9 @@ class FixNeedPassphraseIssueDialogFragment : BaseDialogFragment() {
     val KEY_PREDEFINED_FINGERPRINTS = GeneralUtil.generateUniqueExtraKey(
       "KEY_PREDEFINED_FINGERPRINTS", FixNeedPassphraseIssueDialogFragment::class.java
     )
+
+    val KEY_REQUEST_INCOMING_BUNDLE = GeneralUtil.generateUniqueExtraKey(
+      "KEY_REQUEST_INCOMING_BUNDLE", FixNeedPassphraseIssueDialogFragment::class.java
+    )
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProcessMessageDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProcessMessageDialogFragment.kt
new file mode 100644
index 0000000000..fd0892b4e8
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProcessMessageDialogFragment.kt
@@ -0,0 +1,137 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment.dialog
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModel
+import androidx.navigation.fragment.navArgs
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.databinding.FragmentProcessMessageBinding
+import com.flowcrypt.email.extensions.androidx.fragment.app.navController
+import com.flowcrypt.email.extensions.exceptionMsg
+import com.flowcrypt.email.extensions.gone
+import com.flowcrypt.email.extensions.launchAndRepeatWithLifecycle
+import com.flowcrypt.email.extensions.visible
+import com.flowcrypt.email.jetpack.lifecycle.CustomAndroidViewModelFactory
+import com.flowcrypt.email.jetpack.viewmodel.ProcessMessageViewModel
+import com.flowcrypt.email.ui.activity.fragment.base.ProgressBehaviour
+
+/**
+ * @author Denys Bondarenko
+ */
+class ProcessMessageDialogFragment : BaseDialogFragment(), ProgressBehaviour {
+  private var binding: FragmentProcessMessageBinding? = null
+  private val args by navArgs<ProcessMessageDialogFragmentArgs>()
+  private val processMessageViewModel: ProcessMessageViewModel by viewModels {
+    object : CustomAndroidViewModelFactory(requireActivity().application) {
+      @Suppress("UNCHECKED_CAST")
+      override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return ProcessMessageViewModel(
+          message = args.message,
+          skipAttachmentsRawData = args.attachmentId == null,
+          application = requireActivity().application
+        ) as T
+      }
+    }
+  }
+
+  override val progressView: View?
+    get() = binding?.layoutProgress?.root
+  override val contentView: View?
+    get() = null
+  override val statusView: View?
+    get() = binding?.status?.root
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    isCancelable = false
+    collectProcessMessageStateFlow()
+  }
+
+  override fun onStart() {
+    super.onStart()
+    getButton(AlertDialog.BUTTON_POSITIVE)?.apply {
+      setOnClickListener {
+        processMessageViewModel.retry()
+        gone()
+      }
+      //we hide the button at the start up.
+      gone()
+    }
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    binding = FragmentProcessMessageBinding.inflate(
+      LayoutInflater.from(requireContext()),
+      if ((view != null) and (view is ViewGroup)) view as ViewGroup? else null,
+      false
+    )
+
+    val builder = AlertDialog.Builder(requireContext()).apply {
+      setView(binding?.root)
+
+      setNegativeButton(R.string.cancel) { _, _ ->
+        navController?.navigateUp()
+      }
+
+      setPositiveButton(R.string.retry) { _, _ -> }
+    }
+
+    return builder.create()
+  }
+
+  private fun collectProcessMessageStateFlow() {
+    launchAndRepeatWithLifecycle {
+      processMessageViewModel.processedMessageFlow.collect {
+        when (it.status) {
+          Result.Status.LOADING -> {
+            showProgress(
+              progressMsg = it.progressMsg,
+              useHorizontalProgressBar = true,
+              progress = it.progress?.toInt() ?: 0
+            )
+          }
+
+          Result.Status.SUCCESS -> {
+            navController?.navigateUp()
+            setFragmentResult(
+              args.requestKey,
+              bundleOf(
+                KEY_REQUEST_KEY to args.requestKey,
+                KEY_REQUEST_CODE to args.requestCode,
+                KEY_RESULT to it.data,
+                KEY_ATTACHMENT_ID to args.attachmentId,
+              )
+            )
+          }
+
+          Result.Status.EXCEPTION -> {
+            showStatus(msg = it.exceptionMsg)
+            (dialog as? AlertDialog)?.getButton(AlertDialog.BUTTON_POSITIVE)?.visible()
+          }
+
+          else -> {}
+        }
+      }
+    }
+  }
+
+  companion object {
+    const val KEY_RESULT = "KEY_RESULT"
+    const val KEY_REQUEST_KEY = "KEY_REQUEST_KEY"
+    const val KEY_REQUEST_CODE = "KEY_REQUEST_CODE"
+    const val KEY_ATTACHMENT_ID = "KEY_ATTACHMENT_ID"
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/AutoCompleteResultRecyclerViewAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/AutoCompleteResultRecyclerViewAdapter.kt
index b4c05e91ca..d5ebe06572 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/AutoCompleteResultRecyclerViewAdapter.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/AutoCompleteResultRecyclerViewAdapter.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.adapter
@@ -53,7 +53,6 @@ class AutoCompleteResultRecyclerViewAdapter(
           .inflate(R.layout.recipient_auto_complete_item, parent, false)
       )
     }
-
   }
 
   override fun getItemId(position: Int): Long {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FragmentsAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageDetailsFragmentsAdapter.kt
similarity index 92%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FragmentsAdapter.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageDetailsFragmentsAdapter.kt
index 5af69ccccd..7cd7784d3d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FragmentsAdapter.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageDetailsFragmentsAdapter.kt
@@ -17,7 +17,7 @@ import com.flowcrypt.email.ui.activity.fragment.MessageDetailsFragmentArgs
 /**
  * @author Denys Bondarenko
  */
-class FragmentsAdapter(
+class MessageDetailsFragmentsAdapter(
   private val localFolder: LocalFolder,
   initialList: List<MessageEntity>,
   fragment: Fragment,
@@ -49,7 +49,7 @@ class FragmentsAdapter(
       arguments = MessageDetailsFragmentArgs(
         messageEntity = asyncListDiffer.currentList[position],
         localFolder = localFolder,
-        isViewPagerMode = true
+        isViewPagerMode = true,
       ).toBundle()
     }
 
@@ -68,8 +68,4 @@ class FragmentsAdapter(
   fun getItem(position: Int): MessageEntity? {
     return asyncListDiffer.currentList.getOrNull(position)
   }
-
-  fun getItemPositionById(id: Long): Int {
-    return asyncListDiffer.currentList.indexOfFirst { item -> item.id == id }
-  }
 }
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageHeadersListAdapter.kt
similarity index 79%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageHeadersListAdapter.kt
index a3860ae19c..d001120489 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageHeadersListAdapter.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.adapter
@@ -8,18 +8,18 @@ package com.flowcrypt.email.ui.adapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.flowcrypt.email.R
+import com.flowcrypt.email.databinding.ItemMimeHeaderBinding
 
 /**
  * @author Denys Bondarenko
  */
-class MsgDetailsRecyclerViewAdapter :
-  ListAdapter<MsgDetailsRecyclerViewAdapter.Header,
-      MsgDetailsRecyclerViewAdapter.ViewHolder>(DiffUtilCallBack()) {
+class MessageHeadersListAdapter :
+  ListAdapter<MessageHeadersListAdapter.Header,
+      MessageHeadersListAdapter.ViewHolder>(DiffUtilCallBack()) {
 
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
     return ViewHolder(
@@ -32,12 +32,11 @@ class MsgDetailsRecyclerViewAdapter :
   }
 
   inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    val tVHeaderName: TextView = itemView.findViewById(R.id.tVHeaderName)
-    val tVHeaderValue: TextView = itemView.findViewById(R.id.tVHeaderValue)
+    val binding = ItemMimeHeaderBinding.bind(itemView)
 
     fun bindTo(item: Header?) {
-      tVHeaderName.text = item?.name
-      tVHeaderValue.text = item?.value
+      binding.tVHeaderName.text = item?.name
+      binding.tVHeaderValue.text = item?.value
     }
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessagesInThreadListAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessagesInThreadListAdapter.kt
new file mode 100644
index 0000000000..0950db4344
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessagesInThreadListAdapter.kt
@@ -0,0 +1,1033 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.adapter
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.Shader
+import android.graphics.Typeface
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.LayerDrawable
+import android.os.Parcelable
+import android.transition.TransitionManager
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.CompoundButton
+import android.widget.TextView
+import androidx.annotation.ColorRes
+import androidx.appcompat.widget.PopupMenu
+import androidx.constraintlayout.widget.ConstraintLayout.LayoutParams
+import androidx.core.content.ContextCompat
+import androidx.core.view.updateLayoutParams
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.email.JavaEmailConstants
+import com.flowcrypt.email.api.email.model.AttachmentInfo
+import com.flowcrypt.email.api.email.model.IncomingMessageInfo
+import com.flowcrypt.email.api.retrofit.response.model.DecryptErrorMsgBlock
+import com.flowcrypt.email.api.retrofit.response.model.DecryptedAttMsgBlock
+import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
+import com.flowcrypt.email.api.retrofit.response.model.PublicKeyMsgBlock
+import com.flowcrypt.email.api.retrofit.response.model.SecurityWarningMsgBlock
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.database.entity.PublicKeyEntity
+import com.flowcrypt.email.databinding.ItemMessageInThreadCollapsedBinding
+import com.flowcrypt.email.databinding.ItemMessageInThreadExpandedBinding
+import com.flowcrypt.email.databinding.ItemThreadHeaderBinding
+import com.flowcrypt.email.extensions.android.widget.useGlideToApplyImageFromSource
+import com.flowcrypt.email.extensions.gone
+import com.flowcrypt.email.extensions.kotlin.clip
+import com.flowcrypt.email.extensions.visible
+import com.flowcrypt.email.extensions.visibleOrGone
+import com.flowcrypt.email.extensions.visibleOrInvisible
+import com.flowcrypt.email.model.MessageEncryptionType
+import com.flowcrypt.email.security.model.PgpKeyRingDetails
+import com.flowcrypt.email.security.pgp.PgpDecryptAndOrVerify
+import com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration.MarginItemDecoration
+import com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration.VerticalSpaceMarginItemDecoration
+import com.flowcrypt.email.ui.widget.TileDrawable
+import com.flowcrypt.email.util.DateTimeUtil
+import com.flowcrypt.email.util.GeneralUtil
+import com.flowcrypt.email.util.UIUtil
+import com.flowcrypt.email.util.graphics.glide.AvatarModelLoader
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
+import com.google.android.material.color.MaterialColors
+import kotlinx.parcelize.Parcelize
+import java.nio.charset.StandardCharsets
+
+/**
+ * @author Denys Bondarenko
+ */
+class MessagesInThreadListAdapter(
+  private val adapterListener: AdapterListener,
+  private val onMessageActionsListener: OnMessageActionsListener
+) :
+  ListAdapter<MessagesInThreadListAdapter.Item, MessagesInThreadListAdapter.BaseViewHolder>(
+    DIFF_UTIL_ITEM_CALLBACK
+  ) {
+
+  /**
+   * A cache of the last content height of WebView. It will help to prevent the content blinking
+   */
+  private val mapWebViewHeight = mutableMapOf<Int, Int>()
+
+  override fun getItemViewType(position: Int): Int {
+    val item = getItem(position)
+    return when (position) {
+      0 -> Type.HEADER.id
+      else -> if (item is Message) {
+        item.type.id
+      } else error("Unreachable")
+    }
+  }
+
+  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
+    return when (viewType) {
+      Type.HEADER.id -> HeaderViewHolder(
+        LayoutInflater.from(parent.context).inflate(R.layout.item_thread_header, parent, false),
+        object : GmailApiLabelsListAdapter.OnLabelClickListener {
+          override fun onLabelClick(label: GmailApiLabelsListAdapter.Label) {
+            onMessageActionsListener.onLabelClicked(label)
+          }
+        }
+      )
+
+      Type.MESSAGE_COLLAPSED.id -> MessageCollapsedViewHolder(
+        LayoutInflater.from(parent.context)
+          .inflate(R.layout.item_message_in_thread_collapsed, parent, false)
+      )
+
+      Type.MESSAGE_EXPANDED.id -> MessageExpandedViewHolder(
+        LayoutInflater.from(parent.context)
+          .inflate(R.layout.item_message_in_thread_expanded, parent, false)
+      )
+
+      else -> error("Unreachable")
+    }
+  }
+
+  override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
+    when (holder.itemViewType) {
+      Type.HEADER.id -> {
+        val threadHeader = (getItem(position) as? ThreadHeader) ?: return
+        (holder as? HeaderViewHolder)?.bindTo(threadHeader)
+      }
+
+      Type.MESSAGE_COLLAPSED.id -> {
+        val message = (getItem(position) as? Message) ?: return
+        (holder as? MessageCollapsedViewHolder)?.bindTo(
+          position = position,
+          message = message,
+          onMessageActionsListener = onMessageActionsListener
+        )
+      }
+
+      Type.MESSAGE_EXPANDED.id -> {
+        val message = (getItem(position) as? Message) ?: return
+        (holder as? MessageExpandedViewHolder)?.bindTo(
+          position = position,
+          message = message,
+          onMessageActionsListener = onMessageActionsListener
+        )
+      }
+
+      else -> error("Unreachable")
+    }
+  }
+
+  override fun onViewRecycled(holder: BaseViewHolder) {
+    super.onViewRecycled(holder)
+    //try to cache the last content height of WebView. It will help to prevent the content blinking
+    if (holder is MessageExpandedViewHolder) {
+      val position = holder.bindingAdapterPosition
+      val holderWebViewHeight = holder.binding.emailWebView.height
+      if (holderWebViewHeight != 0) {
+        mapWebViewHeight[position] = holderWebViewHeight
+      }
+    }
+  }
+
+  override fun submitList(list: List<Item>?) {
+    super.submitList(list)
+    adapterListener.onDataSubmitted(list)
+  }
+
+  fun getMessageItemById(messageId: Long): Message? {
+    return currentList.firstOrNull {
+      it.id == messageId
+    } as? Message
+  }
+
+  interface OnMessageActionsListener {
+    fun onMessageClick(position: Int, message: Message)
+    fun onHeadersDetailsClick(position: Int, message: Message)
+    fun onMessageChanged(position: Int, message: Message)
+    fun onLabelClicked(label: GmailApiLabelsListAdapter.Label)
+    fun onAttachmentDownloadClick(attachmentInfo: AttachmentInfo, message: Message)
+    fun onAttachmentPreviewClick(attachmentInfo: AttachmentInfo, message: Message)
+    fun onReply(message: Message)
+    fun onReplyAll(message: Message)
+    fun onForward(message: Message)
+    fun onEditDraft(message: Message)
+    fun onDeleteDraft(message: Message)
+    fun addRecipientsBasedOnPgpKeyDetails(pgpKeyRingDetails: PgpKeyRingDetails)
+    fun updateExistingPubKey(publicKeyEntity: PublicKeyEntity, pgpKeyRingDetails: PgpKeyRingDetails)
+    fun importAdditionalPrivateKeys(message: Message)
+    fun fixMissingPassphraseIssue(message: Message, fingerprints: List<String>)
+    fun showSendersPublicKeyDialog(message: Message)
+    fun getAccount(): AccountEntity?
+  }
+
+  interface AdapterListener {
+    fun onDataSubmitted(list: List<Item>?)
+  }
+
+  abstract inner class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    protected val context: Context
+      get() = itemView.context
+  }
+
+  inner class HeaderViewHolder(
+    itemView: View,
+    listener: GmailApiLabelsListAdapter.OnLabelClickListener
+  ) : BaseViewHolder(itemView) {
+    val binding = ItemThreadHeaderBinding.bind(itemView)
+    private val gmailApiLabelsListAdapter = GmailApiLabelsListAdapter(listener)
+
+    init {
+      binding.recyclerViewLabels.apply {
+        layoutManager = FlexboxLayoutManager(context).apply {
+          flexDirection = FlexDirection.ROW
+          justifyContent = JustifyContent.FLEX_START
+        }
+        addItemDecoration(
+          MarginItemDecoration(
+            marginRight = resources.getDimensionPixelSize(R.dimen.default_margin_small),
+            marginTop = resources.getDimensionPixelSize(R.dimen.default_margin_small)
+          )
+        )
+        adapter = gmailApiLabelsListAdapter
+      }
+    }
+
+    fun bindTo(threadHeader: ThreadHeader) {
+      binding.textViewSubject.text = threadHeader.subject
+      gmailApiLabelsListAdapter.submitList(threadHeader.labels)
+    }
+  }
+
+  inner class MessageCollapsedViewHolder(itemView: View) : BaseViewHolder(itemView) {
+    val binding = ItemMessageInThreadCollapsedBinding.bind(itemView)
+
+    fun bindTo(
+      position: Int,
+      message: Message,
+      onMessageActionsListener: OnMessageActionsListener
+    ) {
+      val messageEntity = message.messageEntity
+      itemView.setOnClickListener {
+        onMessageActionsListener.onMessageClick(position, message)
+        if (message.incomingMessageInfo == null) {
+          mapWebViewHeight.remove(position)
+        }
+      }
+      val senderAddress = messageEntity.generateFromText(context)
+      binding.imageViewAvatar.useGlideToApplyImageFromSource(
+        source = AvatarModelLoader.SCHEMA_AVATAR + senderAddress
+      )
+      binding.textViewSnippet.text = messageEntity.snippet
+      binding.tVTo.text = messageEntity.generateToText(context)
+      binding.textViewSender.apply {
+        if (messageEntity.isSeen) {
+          setTypeface(null, Typeface.NORMAL)
+          setTextColor(
+            MaterialColors.getColor(
+              context,
+              com.google.android.material.R.attr.colorOnSurfaceVariant,
+              Color.BLACK
+            )
+          )
+        } else {
+          setTypeface(null, Typeface.BOLD)
+          setTextColor(
+            MaterialColors.getColor(context, R.attr.itemTitleColor, Color.BLACK)
+          )
+        }
+
+        text = messageEntity.appendDraftLabelIfNeeded(context, senderAddress)
+      }
+      binding.textViewDate.apply {
+        text = DateTimeUtil.formatSameDayTime(context, messageEntity.receivedDate ?: 0)
+        if (messageEntity.isSeen) {
+          setTypeface(null, Typeface.NORMAL)
+          setTextColor(
+            MaterialColors.getColor(context, R.attr.itemSubTitleColor, Color.BLACK)
+          )
+        } else {
+          setTypeface(null, Typeface.BOLD)
+          setTextColor(
+            MaterialColors.getColor(context, R.attr.itemTitleColor, Color.BLACK)
+          )
+        }
+      }
+      binding.viewHasPgp.visibleOrGone(messageEntity.hasPgp == true || messageEntity.isEncrypted == true)
+      binding.viewHasAttachments.visibleOrGone(messageEntity.hasAttachments == true)
+      binding.textViewDate.setTypeface(
+        null,
+        if (messageEntity.isSeen) {
+          Typeface.NORMAL
+        } else {
+          Typeface.BOLD
+        }
+      )
+    }
+  }
+
+  inner class MessageExpandedViewHolder(itemView: View) : BaseViewHolder(itemView) {
+    val binding = ItemMessageInThreadExpandedBinding.bind(itemView)
+
+    private val messageHeadersListAdapter = MessageHeadersListAdapter()
+    private val pgpBadgeListAdapter = PgpBadgeListAdapter()
+
+    init {
+      initSomeRecyclerViews()
+    }
+
+    fun bindTo(
+      position: Int,
+      message: Message,
+      onMessageActionsListener: OnMessageActionsListener
+    ) {
+      binding.layoutHeader.setOnClickListener {
+        onMessageActionsListener.onMessageClick(
+          position,
+          message
+        )
+      }
+
+      binding.imageButtonEditDraft.apply {
+        visibleOrGone(message.messageEntity.isDraft && !message.hasActiveDraftUploadingProcess)
+        setOnClickListener {
+          onMessageActionsListener.onEditDraft(message)
+        }
+      }
+
+      binding.imageButtonDeleteDraft.apply {
+        visibleOrGone(message.messageEntity.isDraft && !message.hasActiveDraftUploadingProcess)
+        setOnClickListener {
+          onMessageActionsListener.onDeleteDraft(message)
+        }
+      }
+
+      binding.progressBarSavingDraft.apply {
+        visibleOrGone(message.messageEntity.isDraft && message.hasActiveDraftUploadingProcess)
+      }
+
+      binding.imageButtonReplyAll.apply {
+        visibleOrInvisible(!message.messageEntity.isDraft)
+        setOnClickListener {
+          onMessageActionsListener.onReplyAll(message)
+        }
+      }
+
+      binding.imageButtonMoreOptions.apply {
+        visibleOrInvisible(!message.messageEntity.isDraft)
+        setOnClickListener {
+          showPopupForMoreOptionButton(onMessageActionsListener, message)
+        }
+      }
+
+      binding.textViewDate.apply {
+        visibleOrInvisible(!message.isHeadersDetailsExpanded)
+        val isOutbox = JavaEmailConstants.FOLDER_OUTBOX.equals(
+          message.messageEntity.folder,
+          ignoreCase = true
+        )
+        text = if (isOutbox) {
+          DateTimeUtil.formatSameDayTime(context, message.messageEntity.sentDate ?: 0)
+        } else {
+          DateTimeUtil.formatSameDayTime(context, message.messageEntity.receivedDate ?: 0)
+        }
+      }
+
+      binding.rVMsgDetails.visibleOrGone(message.isHeadersDetailsExpanded)
+
+      binding.iBShowDetails.apply {
+        setImageResource(
+          if (message.isHeadersDetailsExpanded) {
+            R.drawable.ic_arrow_drop_up
+          } else {
+            R.drawable.ic_arrow_drop_down
+          }
+        )
+
+        setOnClickListener {
+          onMessageActionsListener.onHeadersDetailsClick(position, message)
+        }
+      }
+
+      val senderAddress = message.messageEntity.generateFromText(context)
+      binding.textViewSenderAddress.text =
+        message.messageEntity.appendDraftLabelIfNeeded(context, senderAddress)
+      binding.imageViewAvatar.useGlideToApplyImageFromSource(
+        source = AvatarModelLoader.SCHEMA_AVATAR + senderAddress
+      )
+
+      binding.tVTo.text = message.messageEntity.generateToText(context)
+
+      binding.imageButtonReplyAll.apply {
+        imageTintList = ColorStateList.valueOf(
+          ContextCompat.getColor(
+            context, if (message.messageEntity.hasPgp == true) {
+              R.color.colorPrimary
+            } else {
+              R.color.red
+            }
+          )
+        )
+      }
+
+      messageHeadersListAdapter.submitList(message.messageEntity.generateDetailsHeaders(context))
+
+      binding.rVAttachments.adapter = AttachmentsRecyclerViewAdapter(
+        isDeleteEnabled = false,
+        attachmentActionListener = object :
+          AttachmentsRecyclerViewAdapter.AttachmentActionListener {
+          override fun onDownloadClick(attachmentInfo: AttachmentInfo) {
+            onMessageActionsListener.onAttachmentDownloadClick(attachmentInfo, message)
+          }
+
+          override fun onAttachmentClick(attachmentInfo: AttachmentInfo) {}
+
+          override fun onPreviewClick(attachmentInfo: AttachmentInfo) {
+            onMessageActionsListener.onAttachmentPreviewClick(attachmentInfo, message)
+          }
+
+          override fun onDeleteClick(attachmentInfo: AttachmentInfo) {}
+        }
+      ).apply {
+        submitList(message.attachments.filterNot { it.isHidden() })
+      }
+
+      binding.emailWebView.apply {
+        updateLayoutParams {
+          height = mapWebViewHeight[position] ?: LayoutParams.WRAP_CONTENT
+        }
+      }
+
+      if (message.incomingMessageInfo != null) {
+        updateMsgView(message, onMessageActionsListener)
+        updatePgpBadges(message)
+      }
+    }
+
+    private fun showPopupForMoreOptionButton(
+      onMessageActionsListener: OnMessageActionsListener,
+      message: Message
+    ) {
+      PopupMenu(context, binding.imageButtonMoreOptions).apply {
+        menuInflater.inflate(R.menu.popup_reply_actions, menu)
+        setOnMenuItemClickListener {
+          when (it.itemId) {
+            R.id.menuActionReply -> {
+              onMessageActionsListener.onReply(message)
+              true
+            }
+
+            R.id.menuActionForward -> {
+              onMessageActionsListener.onForward(message)
+              true
+            }
+
+            else -> {
+              true
+            }
+          }
+        }
+        show()
+      }
+    }
+
+    private fun updatePgpBadges(message: Message) {
+      val badges = mutableListOf<PgpBadgeListAdapter.PgpBadge>()
+      val incomingMessageInfo: IncomingMessageInfo = message.incomingMessageInfo ?: return
+
+      if (incomingMessageInfo.encryptionType == MessageEncryptionType.ENCRYPTED) {
+        badges.add(PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.ENCRYPTED))
+      } else {
+        badges.add(PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.NOT_ENCRYPTED))
+      }
+
+      val verificationResult = incomingMessageInfo.verificationResult
+      if (verificationResult.hasSignedParts) {
+        val badge = when {
+          verificationResult.hasBadSignatures -> {
+            PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.BAD_SIGNATURE)
+          }
+
+          verificationResult.hasUnverifiedSignatures -> {
+            if (message.hasActiveSignatureVerification) {
+              PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.VERIFYING_SIGNATURE)
+            } else {
+              PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.CAN_NOT_VERIFY_SIGNATURE)
+            }
+          }
+
+          verificationResult.isPartialSigned -> {
+            PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.ONLY_PARTIALLY_SIGNED)
+          }
+
+          !verificationResult.isPartialSigned && verificationResult.hasMixedSignatures -> {
+            PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.MIXED_SIGNED)
+          }
+
+          else -> PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.SIGNED)
+        }
+        badges.add(badge)
+      } else {
+        badges.add(PgpBadgeListAdapter.PgpBadge(PgpBadgeListAdapter.PgpBadge.Type.NOT_SIGNED))
+      }
+      pgpBadgeListAdapter.submitList(badges)
+    }
+
+    private fun updateMsgView(
+      message: Message,
+      onMessageActionsListener: OnMessageActionsListener
+    ) {
+      val msgInfo = message.incomingMessageInfo ?: return
+      binding.emailWebView.loadUrl("about:blank")
+      binding.layoutMessageParts.removeAllViews()
+      binding.layoutSecurityWarnings.removeAllViews()
+
+      var isHtmlDisplayed = false
+
+      for (block in msgInfo.msgBlocks ?: emptyList()) {
+        val layoutInflater = LayoutInflater.from(context)
+        when (block.type) {
+          MsgBlock.Type.SECURITY_WARNING -> {
+            if (block is SecurityWarningMsgBlock) {
+              when (block.warningType) {
+                SecurityWarningMsgBlock.WarningType.RECEIVED_SPF_SOFT_FAIL -> {
+                  binding.layoutSecurityWarnings.addView(
+                    getView(
+                      originalMsg = block.content?.clip(context, TEXT_MAX_SIZE),
+                      errorMsg = context.getText(R.string.spf_soft_fail_warning),
+                      layoutInflater = layoutInflater,
+                      leftBorderColor = R.color.orange
+                    )
+                  )
+                }
+              }
+            }
+          }
+
+          MsgBlock.Type.DECRYPTED_HTML, MsgBlock.Type.PLAIN_HTML -> {
+            if (!isHtmlDisplayed) {
+              setupWebView(block)
+              isHtmlDisplayed = true
+            }
+          }
+
+          MsgBlock.Type.PLAIN_TEXT -> {
+            binding.layoutMessageParts.addView(genTextPart(block, layoutInflater))
+          }
+
+          MsgBlock.Type.PUBLIC_KEY ->
+            binding.layoutMessageParts.addView(
+              genPublicKeyPart(
+                block as PublicKeyMsgBlock,
+                layoutInflater,
+                onMessageActionsListener
+              )
+            )
+
+          MsgBlock.Type.DECRYPT_ERROR -> {
+            binding.layoutMessageParts.addView(
+              genDecryptErrorPart(
+                message,
+                block as DecryptErrorMsgBlock,
+                layoutInflater
+              )
+            )
+          }
+
+          MsgBlock.Type.DECRYPTED_ATT -> {
+            val decryptAtt = block as? DecryptedAttMsgBlock
+            if (decryptAtt == null) {
+              handleOtherBlock(block, layoutInflater)
+            }
+          }
+
+          MsgBlock.Type.ENCRYPTED_SUBJECT, MsgBlock.Type.INLINE_ATT -> {}// we should skip such blocks here
+
+          else -> handleOtherBlock(block, layoutInflater)
+        }
+      }
+    }
+
+    private fun setupWebView(block: MsgBlock) {
+      binding.emailWebView.configure()
+
+      val text = block.content?.clip(context, TEXT_MAX_SIZE) ?: ""
+
+      binding.emailWebView.loadDataWithBaseURL(
+        null,
+        text,
+        "text/html",
+        StandardCharsets.UTF_8.displayName(),
+        null
+      )
+    }
+
+    private fun genPublicKeyPart(
+      block: PublicKeyMsgBlock,
+      inflater: LayoutInflater,
+      onMessageActionsListener: OnMessageActionsListener
+    ): View {
+      if (block.error?.errorMsg?.isNotEmpty() == true) {
+        return getView(
+          block.content?.clip(context, TEXT_MAX_SIZE),
+          context.getString(R.string.msg_contains_not_valid_pub_key, block.error.errorMsg),
+          inflater
+        )
+      }
+
+      val pubKeyView = inflater.inflate(
+        R.layout.message_part_public_key,
+        binding.layoutMessageParts,
+        false
+      ) as ViewGroup
+      val textViewPgpPublicKey = pubKeyView.findViewById<TextView>(R.id.textViewPgpPublicKey)
+      val switchShowPublicKey = pubKeyView.findViewById<CompoundButton>(R.id.switchShowPublicKey)
+
+      switchShowPublicKey.setOnCheckedChangeListener { buttonView, isChecked ->
+        TransitionManager.beginDelayedTransition(pubKeyView)
+        textViewPgpPublicKey.visibility = if (isChecked) View.VISIBLE else View.GONE
+        buttonView.setText(if (isChecked) R.string.hide_the_public_key else R.string.show_the_public_key)
+      }
+
+      val keyDetails = block.keyDetails
+      val userIds = keyDetails?.getUserIdsAsSingleString()
+
+      if (userIds?.isNotEmpty() == true) {
+        val keyOwner = pubKeyView.findViewById<TextView>(R.id.textViewKeyOwnerTemplate)
+        keyOwner.text = context.getString(R.string.template_message_part_public_key_owner, userIds)
+      }
+
+      val fingerprint = pubKeyView.findViewById<TextView>(R.id.textViewFingerprintTemplate)
+      UIUtil.setHtmlTextToTextView(
+        context.getString(
+          R.string.template_message_part_public_key_fingerprint,
+          GeneralUtil.doSectionsInText(" ", keyDetails?.fingerprint, 4)
+        ), fingerprint
+      )
+
+      textViewPgpPublicKey.text =
+        (block.keyDetails?.publicKey ?: block.content)?.clip(context, TEXT_MAX_SIZE)
+
+      val existingRecipientWithPubKeys = block.existingRecipientWithPubKeys
+      val button = pubKeyView.findViewById<Button>(R.id.buttonKeyAction)
+      val textViewStatus = pubKeyView.findViewById<TextView>(R.id.textViewStatus)
+      val textViewManualImportWarning =
+        pubKeyView.findViewById<TextView>(R.id.textViewManualImportWarning)
+      if (keyDetails?.usableForEncryption == true) {
+        if (existingRecipientWithPubKeys == null) {
+          button?.apply {
+            setText(R.string.import_pub_key)
+            setOnClickListener {
+              onMessageActionsListener.addRecipientsBasedOnPgpKeyDetails(keyDetails)
+              gone()
+              textViewManualImportWarning.gone()
+              textViewStatus?.apply {
+                text = context.getString(R.string.already_imported)
+                visible()
+              }
+            }
+          }
+        } else {
+          val matchingKeyByFingerprint = existingRecipientWithPubKeys.publicKeys.firstOrNull {
+            it.fingerprint.equals(keyDetails.fingerprint, true)
+          }
+          if (matchingKeyByFingerprint != null) {
+            when {
+              matchingKeyByFingerprint.pgpKeyRingDetails?.isRevoked == true -> {
+                textViewStatus?.text = context.getString(R.string.key_is_revoked_unable_to_update)
+                textViewStatus?.setTextColor(UIUtil.getColor(context, R.color.red))
+                textViewStatus?.visible()
+                textViewManualImportWarning?.gone()
+                button?.gone()
+              }
+
+              keyDetails.isNewerThan(matchingKeyByFingerprint.pgpKeyRingDetails) -> {
+                textViewManualImportWarning?.visible()
+                button?.apply {
+                  setText(R.string.update_pub_key)
+                  setOnClickListener {
+                    onMessageActionsListener.updateExistingPubKey(
+                      matchingKeyByFingerprint,
+                      keyDetails
+                    )
+                    gone()
+                  }
+                }
+              }
+
+              else -> {
+                textViewStatus?.text = context.getString(R.string.already_imported)
+                textViewStatus.visible()
+                textViewManualImportWarning?.gone()
+                button?.gone()
+              }
+            }
+          } else {
+            button?.gone()
+          }
+        }
+      } else {
+        textViewStatus.text = context.getString(R.string.cannot_be_used_for_encryption)
+        textViewStatus.setTextColor(UIUtil.getColor(context, R.color.red))
+        textViewManualImportWarning?.gone()
+        button?.gone()
+        textViewStatus.visible()
+      }
+
+      return pubKeyView
+    }
+
+    private fun genDecryptErrorPart(
+      message: Message,
+      block: DecryptErrorMsgBlock,
+      layoutInflater: LayoutInflater
+    ): View {
+      val decryptError = block.decryptErr ?: return View(context)
+
+      when (decryptError.details?.type) {
+        PgpDecryptAndOrVerify.DecryptionErrorType.KEY_MISMATCH ->
+        return generateMissingPrivateKeyLayout(
+          message = message,
+          pgpMsg = block.content?.clip(context, TEXT_MAX_SIZE),
+          inflater = layoutInflater,
+          onMessageActionsListener = onMessageActionsListener
+        )
+
+        PgpDecryptAndOrVerify.DecryptionErrorType.FORMAT -> {
+          val formatErrorMsg = (context.getString(
+            R.string.decrypt_error_message_badly_formatted,
+            context.getString(R.string.app_name)
+          ) + "\n\n"
+              + decryptError.details.type + ": " + decryptError.details.message)
+          return getView(
+            block.content?.clip(context, TEXT_MAX_SIZE),
+            formatErrorMsg,
+            layoutInflater
+          )
+        }
+
+        PgpDecryptAndOrVerify.DecryptionErrorType.OTHER -> {
+          val otherErrorMsg = when (decryptError.details.message) {
+            "Symmetric-Key algorithm TRIPLE_DES is not acceptable for message decryption." -> {
+              context.getString(R.string.message_was_not_decrypted_due_to_triple_des, "TRIPLE_DES")
+            }
+
+            else -> context.getString(
+              R.string.decrypt_error_could_not_open_message,
+              context.getString(R.string.app_name)
+            ) + "\n\n" + context.getString(
+              R.string.decrypt_error_please_write_me,
+              context.getString(R.string.support_email)
+            ) + "\n\n" + decryptError.details.type +
+                ": " + decryptError.details.message +
+                "\n\n" + decryptError.details.stack
+          }
+
+          return getView(block.content?.clip(context, TEXT_MAX_SIZE), otherErrorMsg, layoutInflater)
+        }
+
+        else -> {
+          var btText: String? = null
+          var onClickListener: View.OnClickListener? = null
+          if (decryptError.details?.type == PgpDecryptAndOrVerify.DecryptionErrorType.NEED_PASSPHRASE) {
+            btText = context.getString(R.string.fix)
+            onClickListener = View.OnClickListener {
+              val fingerprints = decryptError.fingerprints ?: return@OnClickListener
+              onMessageActionsListener.fixMissingPassphraseIssue(message, fingerprints)
+            }
+          }
+
+          val detailedMessage = when (decryptError.details?.type) {
+            PgpDecryptAndOrVerify.DecryptionErrorType.NO_MDC -> {
+              context.getString(R.string.decrypt_error_message_no_mdc)
+            }
+
+            PgpDecryptAndOrVerify.DecryptionErrorType.BAD_MDC -> {
+              context.getString(R.string.decrypt_error_message_bad_mdc)
+            }
+
+            else -> decryptError.details?.message
+          }
+
+          return getView(
+            originalMsg = block.content?.clip(context, TEXT_MAX_SIZE),
+            errorMsg = context.getString(
+              R.string.could_not_decrypt_message_due_to_error,
+              decryptError.details?.type.toString() + ": " + detailedMessage
+            ),
+            layoutInflater = layoutInflater,
+            buttonText = btText,
+            onClickListener = onClickListener
+          )
+        }
+      }
+    }
+
+    private fun getView(
+      originalMsg: String?,
+      errorMsg: CharSequence,
+      layoutInflater: LayoutInflater,
+      buttonText: String? = null,
+      @ColorRes
+      leftBorderColor: Int = R.color.red,
+      onClickListener: View.OnClickListener? = null
+    ): View {
+      val viewGroup = layoutInflater.inflate(
+        R.layout.message_part_pgp_message_error,
+        binding.layoutMessageParts, false
+      ) as ViewGroup
+      val container = viewGroup.findViewById<ViewGroup>(R.id.container)
+      val existingBackground = container.background as LayerDrawable
+
+      //use SVG as a repeatable drawable
+      val drawable =
+        ContextCompat.getDrawable(context, R.drawable.bg_security_repeat_template)
+      if (drawable != null && existingBackground.numberOfLayers > 1) {
+        existingBackground.setDrawable(1, TileDrawable(drawable, Shader.TileMode.REPEAT))
+      }
+
+      val gradientDrawable = existingBackground.getDrawable(3)
+      if (gradientDrawable is GradientDrawable) {
+        gradientDrawable.setColor(ContextCompat.getColor(context, leftBorderColor))
+      }
+
+      val textViewErrorMsg = viewGroup.findViewById<TextView>(R.id.textViewErrorMessage)
+      textViewErrorMsg.text = errorMsg
+      if (originalMsg != null) {
+        viewGroup.addView(genShowOrigMsgLayout(originalMsg, layoutInflater, viewGroup))
+        onClickListener?.let {
+          val btAction = viewGroup.findViewById<TextView>(R.id.btAction)
+          btAction.text = buttonText
+          btAction.visible()
+          btAction.setOnClickListener(it)
+        }
+      }
+      return viewGroup
+    }
+
+    /**
+     * Generate a layout with switch button which will be regulate visibility of original message info.
+     *
+     * @param msg            The original pgp message info.
+     * @param layoutInflater The [LayoutInflater] instance.
+     * @param rootView       The root view which will be used while we create a new layout using
+     * [LayoutInflater].
+     * @return A generated layout.
+     */
+    private fun genShowOrigMsgLayout(
+      msg: String?, layoutInflater: LayoutInflater,
+      rootView: ViewGroup
+    ): ViewGroup {
+      val viewGroup =
+        layoutInflater.inflate(R.layout.pgp_show_original_message, rootView, false) as ViewGroup
+      val textViewOrigPgpMsg = viewGroup.findViewById<TextView>(R.id.textViewOrigPgpMsg)
+      textViewOrigPgpMsg.text = msg
+
+      val switchShowOrigMsg = viewGroup.findViewById<CompoundButton>(R.id.switchShowOrigMsg)
+
+      switchShowOrigMsg.setOnCheckedChangeListener { buttonView, isChecked ->
+        TransitionManager.beginDelayedTransition(rootView)
+        textViewOrigPgpMsg.visibility = if (isChecked) View.VISIBLE else View.GONE
+        buttonView.setText(if (isChecked) R.string.hide_original_message else R.string.show_original_message)
+      }
+      return viewGroup
+    }
+
+    private fun genTextPart(block: MsgBlock, layoutInflater: LayoutInflater): View {
+      return genDefPart(
+        block,
+        layoutInflater,
+        R.layout.message_part_text,
+        binding.layoutMessageParts
+      )
+    }
+
+    private fun genDefPart(
+      block: MsgBlock,
+      inflater: LayoutInflater,
+      res: Int,
+      viewGroup: ViewGroup?
+    ): View {
+      val errorMsg = block.error?.errorMsg
+      return if (errorMsg?.isNotEmpty() == true) {
+        getView(
+          null,
+          context.getString(R.string.msg_contains_not_valid_block, block.type.toString(), errorMsg),
+          inflater
+        )
+      } else {
+        val textViewMsgPartOther = inflater.inflate(res, viewGroup, false) as TextView
+        textViewMsgPartOther.text = block.content?.clip(context, TEXT_MAX_SIZE)
+        textViewMsgPartOther
+      }
+    }
+
+    private fun handleOtherBlock(
+      block: @JvmSuppressWildcards MsgBlock,
+      layoutInflater: LayoutInflater
+    ) {
+      binding.layoutMessageParts.addView(
+        genDefPart(
+          block, layoutInflater,
+          R.layout.message_part_other, binding.layoutMessageParts
+        )
+      )
+    }
+
+    /**
+     * Generate a layout which describes the missing private keys situation.
+     *
+     * @param pgpMsg   The pgp message.
+     * @param inflater The [LayoutInflater] instance.
+     * @return Generated layout.
+     */
+    private fun generateMissingPrivateKeyLayout(
+      message: Message,
+      pgpMsg: String?,
+      inflater: LayoutInflater,
+      onMessageActionsListener: OnMessageActionsListener
+    ): View {
+      val viewGroup = inflater.inflate(
+        R.layout.message_part_pgp_message_missing_private_key, binding.layoutMessageParts, false
+      ) as ViewGroup
+      val buttonImportPrivateKey = viewGroup.findViewById<Button>(R.id.buttonImportPrivateKey)
+      buttonImportPrivateKey?.setOnClickListener {
+        onMessageActionsListener.importAdditionalPrivateKeys(message)
+      }
+
+      val buttonSendOwnPublicKey = viewGroup.findViewById<Button>(R.id.buttonSendOwnPublicKey)
+      buttonSendOwnPublicKey?.setOnClickListener {
+        onMessageActionsListener.showSendersPublicKeyDialog(message)
+      }
+
+      val textViewErrorMsg = viewGroup.findViewById<TextView>(R.id.textViewErrorMessage)
+      if (onMessageActionsListener.getAccount()?.clientConfiguration?.usesKeyManager() == true) {
+        textViewErrorMsg?.text = context.getString(R.string.your_keys_cannot_open_this_message)
+        buttonImportPrivateKey?.gone()
+        buttonSendOwnPublicKey?.text = context.getString(R.string.inform_sender)
+      } else {
+        textViewErrorMsg?.text =
+          context.getString(R.string.decrypt_error_current_key_cannot_open_message)
+      }
+
+      viewGroup.addView(genShowOrigMsgLayout(pgpMsg, inflater, viewGroup))
+      return viewGroup
+    }
+
+    private fun initSomeRecyclerViews() {
+      binding.rVMsgDetails.apply {
+        layoutManager = LinearLayoutManager(context)
+        addItemDecoration(
+          VerticalSpaceMarginItemDecoration(
+            marginTop = 0,
+            marginBottom = 0,
+            marginInternal = resources.getDimensionPixelSize(R.dimen.default_margin_content_small)
+          )
+        )
+        adapter = messageHeadersListAdapter
+      }
+
+      binding.rVPgpBadges.apply {
+        layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
+        addItemDecoration(
+          MarginItemDecoration(
+            marginRight = resources.getDimensionPixelSize(R.dimen.default_margin_small)
+          )
+        )
+        adapter = pgpBadgeListAdapter
+      }
+
+      binding.rVAttachments.apply {
+        layoutManager = LinearLayoutManager(context)
+        addItemDecoration(
+          MarginItemDecoration(
+            marginBottom = resources.getDimensionPixelSize(R.dimen.default_margin_content_small)
+          )
+        )
+      }
+    }
+  }
+
+
+  abstract class Item {
+    abstract val type: Type
+    abstract val id: Long
+    abstract fun areContentsTheSame(other: Any?): Boolean
+  }
+
+  @Parcelize
+  data class Message(
+    val messageEntity: MessageEntity,
+    override val type: Type,
+    val isHeadersDetailsExpanded: Boolean,
+    val attachments: List<AttachmentInfo>,
+    val incomingMessageInfo: IncomingMessageInfo? = null,
+    val hasActiveSignatureVerification: Boolean = false,
+    val hasActiveDraftUploadingProcess: Boolean = false
+  ) : Item(), Parcelable {
+    override val id: Long
+      get() = messageEntity.uid
+
+    override fun areContentsTheSame(other: Any?): Boolean {
+      return this == other
+    }
+  }
+
+  data class ThreadHeader(
+    val subject: String? = null,
+    val labels: List<GmailApiLabelsListAdapter.Label>
+  ) : Item() {
+    override val type: Type = Type.HEADER
+    override val id: Long = type.id.toLong()
+
+    override fun areContentsTheSame(other: Any?): Boolean {
+      return this == other
+    }
+  }
+
+  @Parcelize
+  enum class Type(val id: Int) : Parcelable {
+    HEADER(0), MESSAGE_COLLAPSED(1), MESSAGE_EXPANDED(2),
+  }
+
+  companion object {
+    private val DIFF_UTIL_ITEM_CALLBACK = object : DiffUtil.ItemCallback<Item>() {
+      override fun areItemsTheSame(oldItem: Item, newItem: Item) =
+        oldItem.id == newItem.id
+
+      override fun areContentsTheSame(oldItem: Item, newItem: Item) =
+        oldItem.areContentsTheSame(newItem)
+    }
+
+    private const val TEXT_MAX_SIZE = 50000
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgsPagedListAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgsPagedListAdapter.kt
index d0bb4a968a..4b33a6080e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgsPagedListAdapter.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgsPagedListAdapter.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.adapter
@@ -10,6 +10,7 @@ import android.graphics.Camera
 import android.graphics.Color
 import android.graphics.Typeface
 import android.text.SpannableString
+import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.TextUtils
 import android.text.style.AbsoluteSizeSpan
@@ -51,7 +52,6 @@ import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
 import com.google.android.material.color.MaterialColors
-import jakarta.mail.internet.InternetAddress
 import java.util.regex.Pattern
 
 /**
@@ -230,8 +230,35 @@ class MsgsPagedListAdapter(private val onMessageClickListener: OnMessageClickLis
           }
         )
 
-        val senderAddress = prepareSenderAddress(folderType, messageEntity, context)
-        binding.textViewSenderAddress.text = senderAddress
+        val senderAddress = when (folderType) {
+          FoldersManager.FolderType.OUTBOX -> generateOutboxStatus(context, messageEntity.msgState)
+
+          else -> messageEntity.generateSenderAddresses(
+            context,
+            folderType,
+            context.getString(R.string.me)
+          )
+        }
+        binding.textViewSenderAddress.text = if (messageEntity.isGmailThread) {
+          messageEntity.getThreadSpannableString(context).let { spannableString ->
+            SpannableStringBuilder(senderAddress).apply {
+              if (spannableString.isNotEmpty()) {
+                when {
+                  spannableString.startsWith("(") -> {
+                    append(" ")
+                  }
+
+                  senderAddress.isNotEmpty() -> {
+                    append(", ")
+                  }
+                }
+              }
+              append(spannableString)
+            }
+          }
+        } else {
+          senderAddress
+        }
 
         updateAvatar(senderAddress, folderType, lastDataId == messageEntity.id)
         binding.imageViewAvatar.setOnClickListener {
@@ -299,22 +326,6 @@ class MsgsPagedListAdapter(private val onMessageClickListener: OnMessageClickLis
       lastDataId = messageEntity?.id
     }
 
-    private fun prepareSenderAddress(
-      folderType: FoldersManager.FolderType?,
-      messageEntity: MessageEntity,
-      context: Context
-    ) = when (folderType) {
-      FoldersManager.FolderType.SENT -> generateAddresses(messageEntity.to)
-
-      FoldersManager.FolderType.DRAFTS -> generateAddresses(messageEntity.to).ifEmpty {
-        context.getString(R.string.no_recipients)
-      }
-
-      FoldersManager.FolderType.OUTBOX -> generateOutboxStatus(context, messageEntity.msgState)
-
-      else -> generateAddresses(messageEntity.from)
-    }
-
     private fun changeStatusView(messageEntity: MessageEntity) {
       when (messageEntity.msgState) {
         MessageState.PENDING_ARCHIVING -> {
@@ -524,44 +535,6 @@ class MsgsPagedListAdapter(private val onMessageClickListener: OnMessageClickLis
       changeViewsTypeface(Typeface.NORMAL)
     }
 
-    /**
-     * Prepare the sender name.
-     *
-     *  * Remove common mail domains: gmail.com, yahoo.com, live.com, outlook.com
-     *
-     *
-     * @param name An incoming name
-     * @return A generated sender name.
-     */
-    private fun prepareSenderName(name: String): String {
-      return SENDER_NAME_PATTERN.matcher(name).replaceFirst("")
-    }
-
-    private fun generateAddresses(internetAddresses: List<InternetAddress>?): String {
-      if (internetAddresses == null) {
-        return "null"
-      }
-
-      val iMax = internetAddresses.size - 1
-      if (iMax == -1) {
-        return ""
-      }
-
-      val stringBuilder = StringBuilder()
-      var i = 0
-      while (true) {
-        val address = internetAddresses[i]
-        val displayName =
-          if (TextUtils.isEmpty(address.personal)) address.address else address.personal
-        stringBuilder.append(displayName)
-        if (i == iMax) {
-          return prepareSenderName(stringBuilder.toString())
-        }
-        stringBuilder.append(", ")
-        i++
-      }
-    }
-
     companion object {
       /**
        * [Pattern] which will be used for finding some information in the sender name
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/RecipientChipRecyclerViewAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/RecipientChipRecyclerViewAdapter.kt
index 41215f605b..fa725e3ccc 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/RecipientChipRecyclerViewAdapter.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/RecipientChipRecyclerViewAdapter.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui.adapter
@@ -27,6 +27,7 @@ import com.flowcrypt.email.databinding.ChipRecipientItemBinding
 import com.flowcrypt.email.databinding.ComposeAddRecipientItemBinding
 import com.flowcrypt.email.extensions.kotlin.isValidEmail
 import com.flowcrypt.email.extensions.toast
+import com.flowcrypt.email.util.RecipientLookUpManager
 import com.flowcrypt.email.util.UIUtil
 import com.google.android.material.chip.Chip
 import com.google.android.material.color.MaterialColors
@@ -82,7 +83,7 @@ class RecipientChipRecyclerViewAdapter(
   ) {
     when (holder) {
       is AddViewHolder -> holder.bind()
-      is ChipViewHolder -> holder.bind(getItem(position).itemData as RecipientInfo)
+      is ChipViewHolder -> holder.bind(getItem(position).itemData as RecipientItem)
       is MoreViewHolder -> holder.bind(getItem(position).itemData as ItemData.More)
     }
   }
@@ -91,7 +92,7 @@ class RecipientChipRecyclerViewAdapter(
     return getItem(position).type
   }
 
-  fun submitList(recipients: Map<String, RecipientInfo>, isModifyingEnabled: Boolean = true) {
+  fun submitList(recipients: Map<String, RecipientItem>, isModifyingEnabled: Boolean = true) {
     val filteredList = recipients.values
       .take(if (hasInputFocus()) recipients.size else MAX_VISIBLE_ITEMS_COUNT)
     val hasUpdatingInHiddenItems = (recipients.values - filteredList.toSet()).any { it.isUpdating }
@@ -172,26 +173,26 @@ class RecipientChipRecyclerViewAdapter(
 
   inner class ChipViewHolder(itemView: View) : BaseViewHolder(itemView) {
     val binding = ChipRecipientItemBinding.bind(itemView)
-    fun bind(recipientInfo: RecipientInfo) {
+    fun bind(recipientItem: RecipientItem) {
       val chip = binding.chip
-      chip.text = recipientInfo.recipientWithPubKeys.recipient.name
-        ?: recipientInfo.recipientWithPubKeys.recipient.email
+      chip.text = recipientItem.recipientWithPubKeys.recipient.name
+        ?: recipientItem.recipientWithPubKeys.recipient.email
 
-      updateChipBackgroundColor(chip, recipientInfo)
-      updateChipTextColor(chip, recipientInfo)
-      updateChipIcon(chip, recipientInfo)
+      updateChipBackgroundColor(chip, recipientItem)
+      updateChipTextColor(chip, recipientItem)
+      updateChipIcon(chip, recipientItem)
 
-      chip.isCloseIconVisible = recipientInfo.isModifyingEnabled
+      chip.isCloseIconVisible = recipientItem.isModifyingEnabled
       chip.setOnCloseIconClickListener {
-        onChipsListener.onChipDeleted(recipientType, recipientInfo)
+        onChipsListener.onChipDeleted(recipientType, recipientItem)
       }
     }
 
-    private fun updateChipBackgroundColor(chip: Chip, recipientInfo: RecipientInfo) {
-      val recipientWithPubKeys = recipientInfo.recipientWithPubKeys
+    private fun updateChipBackgroundColor(chip: Chip, recipientItem: RecipientItem) {
+      val recipientWithPubKeys = recipientItem.recipientWithPubKeys
 
       val color = when {
-        recipientInfo.isUpdating -> {
+        recipientItem.isUpdating -> {
           MaterialColors.getColor(
             chip.context,
             com.google.android.material.R.attr.colorSurface,
@@ -217,9 +218,9 @@ class RecipientChipRecyclerViewAdapter(
       chip.chipBackgroundColor = ColorStateList.valueOf(color)
     }
 
-    private fun updateChipTextColor(chip: Chip, recipientInfo: RecipientInfo) {
+    private fun updateChipTextColor(chip: Chip, recipientItem: RecipientItem) {
       val color = when {
-        recipientInfo.isUpdating -> {
+        recipientItem.isUpdating -> {
           MaterialColors.getColor(
             chip.context,
             com.google.android.material.R.attr.colorOnSurface,
@@ -239,8 +240,8 @@ class RecipientChipRecyclerViewAdapter(
       chip.setTextColor(color)
     }
 
-    private fun updateChipIcon(chip: Chip, recipientInfo: RecipientInfo) {
-      chip.chipIcon = if (recipientInfo.isUpdating) prepareProgressDrawable() else null
+    private fun updateChipIcon(chip: Chip, recipientItem: RecipientItem) {
+      chip.chipIcon = if (recipientItem.isUpdating) prepareProgressDrawable() else null
     }
   }
 
@@ -260,11 +261,11 @@ class RecipientChipRecyclerViewAdapter(
   interface OnChipsListener {
     fun onEmailAddressTyped(recipientType: Message.RecipientType, email: CharSequence)
     fun onEmailAddressAdded(recipientType: Message.RecipientType, email: CharSequence)
-    fun onChipDeleted(recipientType: Message.RecipientType, recipientInfo: RecipientInfo)
+    fun onChipDeleted(recipientType: Message.RecipientType, recipientItem: RecipientItem)
     fun onAddFieldFocusChanged(recipientType: Message.RecipientType, hasFocus: Boolean)
   }
 
-  data class RecipientInfo(
+  data class RecipientItem(
     val recipientType: Message.RecipientType,
     val recipientWithPubKeys: RecipientWithPubKeys,
     val creationTime: Long = System.currentTimeMillis(),
@@ -273,6 +274,16 @@ class RecipientChipRecyclerViewAdapter(
     val isModifyingEnabled: Boolean = true
   ) : ItemData {
     override val uniqueId: Long = requireNotNull(recipientWithPubKeys.recipient.id)
+
+    fun toRecipientInfo(): RecipientLookUpManager.RecipientInfo {
+      return RecipientLookUpManager.RecipientInfo(
+        recipientType = recipientType,
+        recipientWithPubKeys = recipientWithPubKeys,
+        creationTime = creationTime,
+        isUpdating = isUpdating,
+        isUpdateFailed = isUpdateFailed
+      )
+    }
   }
 
   data class Item(@Type val type: Int, val itemData: ItemData)
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/ThreadDetailsFragmentsAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/ThreadDetailsFragmentsAdapter.kt
new file mode 100644
index 0000000000..2349adfeab
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/ThreadDetailsFragmentsAdapter.kt
@@ -0,0 +1,71 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.adapter
+
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.AsyncListDiffer
+import androidx.recyclerview.widget.DiffUtil
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.flowcrypt.email.api.email.model.LocalFolder
+import com.flowcrypt.email.database.entity.MessageEntity
+import com.flowcrypt.email.ui.activity.fragment.ThreadDetailsFragment
+import com.flowcrypt.email.ui.activity.fragment.ThreadDetailsFragmentArgs
+
+/**
+ * @author Denys Bondarenko
+ */
+class ThreadDetailsFragmentsAdapter(
+  private val localFolder: LocalFolder,
+  initialList: List<MessageEntity>,
+  fragment: Fragment,
+  listListener: AsyncListDiffer.ListListener<MessageEntity>
+) : FragmentStateAdapter(fragment) {
+  private val diffUtil = object : DiffUtil.ItemCallback<MessageEntity>() {
+    override fun areItemsTheSame(oldItem: MessageEntity, newItem: MessageEntity):
+        Boolean {
+      return oldItem.id == newItem.id
+    }
+
+    override fun areContentsTheSame(oldItem: MessageEntity, newItem: MessageEntity):
+        Boolean {
+      return oldItem == newItem
+    }
+  }
+
+  private val asyncListDiffer = AsyncListDiffer(this, diffUtil)
+
+  init {
+    asyncListDiffer.submitList(initialList)
+    asyncListDiffer.addListListener(listListener)
+  }
+
+  override fun getItemCount(): Int = asyncListDiffer.currentList.size
+
+  override fun createFragment(position: Int): Fragment =
+    ThreadDetailsFragment().apply {
+      arguments = ThreadDetailsFragmentArgs(
+        messageEntityId = asyncListDiffer.currentList[position].id ?: 0,
+        localFolder = localFolder,
+        isViewPagerMode = true,
+      ).toBundle()
+    }
+
+  override fun getItemId(position: Int): Long {
+    return asyncListDiffer.currentList[position].id ?: 0
+  }
+
+  override fun containsItem(itemId: Long): Boolean {
+    return asyncListDiffer.currentList.any { it.id == itemId }
+  }
+
+  fun submit(newList: List<MessageEntity>) {
+    asyncListDiffer.submitList(newList)
+  }
+
+  fun getItem(position: Int): MessageEntity? {
+    return asyncListDiffer.currentList.getOrNull(position)
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/recyclerview/itemdecoration/SkipFirstAndLastDividerItemDecoration.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/recyclerview/itemdecoration/SkipFirstAndLastDividerItemDecoration.kt
new file mode 100644
index 0000000000..bb128dd99f
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/recyclerview/itemdecoration/SkipFirstAndLastDividerItemDecoration.kt
@@ -0,0 +1,27 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration
+
+import android.content.Context
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.divider.MaterialDividerItemDecoration
+
+/**
+ * @author Denys Bondarenko
+ */
+class SkipFirstAndLastDividerItemDecoration(context: Context, orientation: Int) :
+  MaterialDividerItemDecoration(context, orientation) {
+  init {
+    isLastItemDecorated = false
+  }
+
+  override fun shouldDrawDivider(position: Int, adapter: RecyclerView.Adapter<*>?): Boolean {
+    return when {
+      position == 0 -> false
+      else -> super.shouldDrawDivider(position, adapter)
+    }
+  }
+}
\ No newline at end of file
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/NonLockingScrollView.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/NonLockingScrollView.kt
index a3b0c17aae..5a853b5f1e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/NonLockingScrollView.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/NonLockingScrollView.kt
@@ -30,6 +30,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebView
 import android.widget.ScrollView
+import androidx.core.widget.NestedScrollView
 import java.util.ArrayList
 
 /**
@@ -44,7 +45,7 @@ import java.util.ArrayList
  *
  * See https://github.com/k9mail/k-9
  */
-class NonLockingScrollView : ScrollView {
+class NonLockingScrollView : NestedScrollView {
   /**
    * The list of children who should always receive touch events, and not have them intercepted.
    */
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/AvatarGenerator.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/AvatarGenerator.kt
index 23df3f0d44..4a77e7c2a6 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/util/AvatarGenerator.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/AvatarGenerator.kt
@@ -59,7 +59,8 @@ object AvatarGenerator {
     //draw a text
     textPaint.textSize = fontSize
     canvas.drawText(
-      text.substring(0, 2).uppercase(), (bitmapWidth / 2).toFloat(),
+      text.takeIf { it.length > 1 }?.substring(0, 2)?.uppercase() ?: text,
+      (bitmapWidth / 2).toFloat(),
       bitmapHeight / 2 - (textPaint.descent() + textPaint.ascent()) / 2, textPaint
     )
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt
index 6ee89f7d4b..94423cc7c3 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt
@@ -1,13 +1,10 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.util
 
-import android.app.ActivityManager
-import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
-import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.ContentResolver
@@ -39,17 +36,23 @@ import com.flowcrypt.email.api.retrofit.RetrofitApiServiceInterface
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.extensions.hasActiveConnection
+import com.flowcrypt.email.jetpack.workmanager.EmailAndNameWorker
 import com.flowcrypt.email.model.KeysStorage
 import com.flowcrypt.email.security.pgp.PgpKey
 import com.flowcrypt.email.ui.notifications.ErrorNotificationManager
 import com.flowcrypt.email.util.exception.CommonConnectionException
+import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.flowcrypt.email.util.google.GoogleApiClientHelper
 import com.google.android.gms.auth.api.signin.GoogleSignIn
+import jakarta.mail.Message
+import jakarta.mail.MessagingException
+import jakarta.mail.internet.InternetAddress
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import org.apache.commons.io.IOUtils
+import org.eclipse.angus.mail.imap.IMAPFolder
 import org.jose4j.jwt.consumer.JwtConsumerBuilder
 import retrofit2.Retrofit
 import java.io.File
@@ -70,17 +73,6 @@ import java.util.concurrent.TimeUnit
  */
 class GeneralUtil {
   companion object {
-    /**
-     * Check is the app foregrounded or visible.
-     *
-     * @return true if the app is foregrounded or visible.
-     */
-    fun isAppForegrounded(): Boolean {
-      val appProcessInfo = ActivityManager.RunningAppProcessInfo()
-      ActivityManager.getMyMemoryState(appProcessInfo)
-      return appProcessInfo.importance == IMPORTANCE_FOREGROUND || appProcessInfo.importance == IMPORTANCE_VISIBLE
-    }
-
     /**
      * This method checks is it a debug or uiTests build.
      *
@@ -583,5 +575,59 @@ class GeneralUtil {
       val preamble = context.getString(R.string.no_private_keys_suitable_for_encryption)
       return "$preamble <br><br> $stringBuilder"
     }
+
+    suspend fun updateLocalContactsIfNeeded(
+      context: Context,
+      imapFolder: IMAPFolder? = null,
+      messages: Array<Message>
+    ) = withContext(Dispatchers.IO) {
+      try {
+        val isSentFolder = imapFolder?.attributes?.contains("\\Sent") ?: true
+
+        if (isSentFolder) {
+          val emailAndNamePairs = mutableListOf<Pair<String, String?>>()
+          for (message in messages) {
+            emailAndNamePairs.addAll(getEmailAndNamePairs(message))
+          }
+
+          EmailAndNameWorker.enqueue(context, emailAndNamePairs)
+        }
+      } catch (e: MessagingException) {
+        e.printStackTrace()
+        ExceptionUtil.handleError(e)
+      }
+    }
+
+    /**
+     * Generate a list of [Pair] objects from the input message.
+     * This information will be retrieved from "to" and "cc" headers.
+     *
+     * @param msg The input [jakarta.mail.Message].
+     * @return <tt>[List]</tt> of [Pair] objects, which contains information
+     * about
+     * emails and names.
+     * @throws MessagingException when retrieve information about recipients.
+     */
+    private fun getEmailAndNamePairs(msg: Message): List<Pair<String, String>> {
+      val pairs = mutableListOf<Pair<String, String>>()
+
+      val addressesTo = msg.getRecipients(Message.RecipientType.TO)
+      if (addressesTo != null) {
+        for (address in addressesTo) {
+          val internetAddress = address as InternetAddress
+          pairs.add(Pair(internetAddress.address, internetAddress.personal))
+        }
+      }
+
+      val addressesCC = msg.getRecipients(Message.RecipientType.CC)
+      if (addressesCC != null) {
+        for (address in addressesCC) {
+          val internetAddress = address as InternetAddress
+          pairs.add(Pair(internetAddress.address, internetAddress.personal))
+        }
+      }
+
+      return pairs
+    }
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/RecipientLookUpManager.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/RecipientLookUpManager.kt
new file mode 100644
index 0000000000..b384e2392a
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/RecipientLookUpManager.kt
@@ -0,0 +1,230 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.util
+
+import android.app.Application
+import com.flowcrypt.email.api.retrofit.ApiClientRepository
+import com.flowcrypt.email.api.retrofit.response.attester.PubResponse
+import com.flowcrypt.email.api.retrofit.response.base.ApiError
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.database.FlowCryptRoomDatabase
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.database.entity.RecipientEntity
+import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
+import com.flowcrypt.email.security.model.PgpKeyRingDetails
+import com.flowcrypt.email.security.pgp.PgpKey
+import com.flowcrypt.email.util.exception.ApiException
+import jakarta.mail.Message
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * @author Denys Bondarenko
+ */
+class RecipientLookUpManager(
+  private val application: Application,
+  private val roomDatabase: FlowCryptRoomDatabase,
+  private val updateListener: (recipientInfo: RecipientInfo) -> Unit
+) {
+  private val lookUpCandidates = ConcurrentHashMap<String, RecipientInfo>()
+  private val recipientsSessionCache = ConcurrentHashMap<String, RecipientWithPubKeys>()
+
+  private val lookUpLimitedParallelismDispatcher =
+    Dispatchers.IO.limitedParallelism(PARALLELISM_COUNT)
+
+  suspend fun enqueue(recipientInfo: RecipientInfo) = withContext(Dispatchers.IO) {
+    val email = recipientInfo.recipientWithPubKeys.recipient.email
+    if (recipientsSessionCache.containsKey(email)) {
+      //we return a value from the session cache
+      updateListener.invoke(
+        recipientInfo.copy(
+          isUpdating = false,
+          recipientWithPubKeys = requireNotNull(recipientsSessionCache[email])
+        )
+      )
+    } else {
+      lookUpCandidates[email] = recipientInfo
+      if (!recipientInfo.isUpdating) {
+        updateListener.invoke(recipientInfo.copy(isUpdating = true))
+      }
+      try {
+        val recipientWithPubKeysAfterLookUp = lookUp(email)
+        dequeue(email)
+        if (recipientWithPubKeysAfterLookUp.hasUsablePubKey()) {
+          recipientsSessionCache[email] = recipientWithPubKeysAfterLookUp
+        }
+        updateListener.invoke(
+          recipientInfo.copy(
+            isUpdating = false,
+            recipientWithPubKeys = recipientWithPubKeysAfterLookUp
+          )
+        )
+      } catch (e: Exception) {
+        e.printStackTrace()
+        updateListener.invoke(recipientInfo.copy(isUpdating = false))
+      }
+    }
+  }
+
+  fun hasActiveJobs(): Boolean = lookUpCandidates.isNotEmpty()
+
+  private suspend fun lookUp(email: String): RecipientWithPubKeys = withContext(Dispatchers.IO) {
+    val emailLowerCase = email.lowercase()
+    var cachedRecipientWithPubKeys = getCachedRecipientWithPubKeys(emailLowerCase)
+    if (cachedRecipientWithPubKeys == null) {
+      roomDatabase.recipientDao().insertSuspend(RecipientEntity(email = emailLowerCase))
+      cachedRecipientWithPubKeys =
+        roomDatabase.recipientDao().getRecipientWithPubKeysByEmailSuspend(emailLowerCase)
+    }
+
+    getPublicKeysFromRemoteServersInternal(email = emailLowerCase)?.let { pgpKeyDetailsList ->
+      cachedRecipientWithPubKeys?.let { recipientWithPubKeys ->
+        updateCachedInfoWithPubKeysFromLookUp(
+          recipientWithPubKeys,
+          pgpKeyDetailsList
+        )
+      }
+    }
+    cachedRecipientWithPubKeys = getCachedRecipientWithPubKeys(emailLowerCase)
+
+    return@withContext requireNotNull(cachedRecipientWithPubKeys)
+  }
+
+  fun dequeue(email: String) {
+    lookUpCandidates.remove(email)
+  }
+
+  private suspend fun getCachedRecipientWithPubKeys(emailLowerCase: String): RecipientWithPubKeys? =
+    withContext(Dispatchers.IO) {
+      val cachedRecipientWithPubKeys = roomDatabase.recipientDao()
+        .getRecipientWithPubKeysByEmailSuspend(emailLowerCase) ?: return@withContext null
+
+      for (publicKeyEntity in cachedRecipientWithPubKeys.publicKeys) {
+        try {
+          val result = PgpKey.parseKeys(source = publicKeyEntity.publicKey).pgpKeyDetailsList
+          publicKeyEntity.pgpKeyRingDetails = result.firstOrNull()
+        } catch (e: Exception) {
+          e.printStackTrace()
+          publicKeyEntity.isNotUsable = true
+        }
+      }
+      return@withContext cachedRecipientWithPubKeys
+    }
+
+  private suspend fun getPublicKeysFromRemoteServersInternal(email: String):
+      List<PgpKeyRingDetails>? = withContext(Dispatchers.IO) {
+    try {
+      val activeAccount = roomDatabase.accountDao().getActiveAccountSuspend()
+      if (!lookUpCandidates.containsKey(email)) {
+        return@withContext null
+      }
+      val response = pubLookup(email, activeAccount)
+
+      when (response.status) {
+        Result.Status.SUCCESS -> {
+          val sourceString = response.data?.pubkey
+          if (sourceString?.isNotEmpty() == true) {
+            val parsedResult = PgpKey.parseKeys(source = sourceString).pgpKeyDetailsList
+            if (parsedResult.isNotEmpty()) {
+              return@withContext parsedResult
+            }
+          }
+        }
+
+        Result.Status.ERROR -> {
+          throw ApiException(
+            response.apiError ?: ApiError(
+              code = -1,
+              message = "Unknown API error"
+            )
+          )
+        }
+
+        else -> {
+          throw response.exception ?: java.lang.Exception()
+        }
+      }
+    } catch (e: IOException) {
+      e.printStackTrace()
+    }
+
+    null
+  }
+
+  private suspend fun pubLookup(
+    email: String,
+    activeAccount: AccountEntity?
+  ): Result<PubResponse> = withContext(lookUpLimitedParallelismDispatcher) {
+    return@withContext ApiClientRepository.PubLookup.fetchPubKey(
+      context = application,
+      email = email,
+      clientConfiguration = activeAccount?.clientConfiguration
+    )
+  }
+
+  private suspend fun updateCachedInfoWithPubKeysFromLookUp(
+    cachedRecipientEntity: RecipientWithPubKeys,
+    fetchedPgpKeyRingDetailsList: List<PgpKeyRingDetails>
+  ) = withContext(Dispatchers.IO) {
+    val email = cachedRecipientEntity.recipient.email
+    val uniqueMapOfFetchedPubKeys =
+      deduplicateFetchedPubKeysByFingerprint(fetchedPgpKeyRingDetailsList)
+
+    val deDuplicatedListOfFetchedPubKeys = uniqueMapOfFetchedPubKeys.values
+    for (fetchedPgpKeyDetails in deDuplicatedListOfFetchedPubKeys) {
+      val existingPublicKeyEntity = cachedRecipientEntity.publicKeys.firstOrNull {
+        it.fingerprint == fetchedPgpKeyDetails.fingerprint
+      }
+      val existingPgpKeyDetails = existingPublicKeyEntity?.pgpKeyRingDetails
+      if (existingPgpKeyDetails != null) {
+        val isExistingKeyRevoked = existingPgpKeyDetails.isRevoked
+        if (!isExistingKeyRevoked && fetchedPgpKeyDetails.isNewerThan(existingPgpKeyDetails)) {
+          roomDatabase.pubKeyDao().updateSuspend(
+            existingPublicKeyEntity.copy(publicKey = fetchedPgpKeyDetails.publicKey.toByteArray())
+          )
+        }
+      } else {
+        roomDatabase.pubKeyDao()
+          .insertWithReplaceSuspend(fetchedPgpKeyDetails.toPublicKeyEntity(email))
+      }
+    }
+  }
+
+  private fun deduplicateFetchedPubKeysByFingerprint(
+    fetchedPgpKeyRingDetailsList: List<PgpKeyRingDetails>
+  ): Map<String, PgpKeyRingDetails> {
+    val uniqueMapOfFetchedPubKeys = mutableMapOf<String, PgpKeyRingDetails>()
+
+    for (fetchedPgpKeyDetails in fetchedPgpKeyRingDetailsList) {
+      val fetchedFingerprint = fetchedPgpKeyDetails.fingerprint
+      val alreadyEncounteredFetchedPgpKeyDetails = uniqueMapOfFetchedPubKeys[fetchedFingerprint]
+      if (alreadyEncounteredFetchedPgpKeyDetails == null) {
+        uniqueMapOfFetchedPubKeys[fetchedFingerprint] = fetchedPgpKeyDetails
+      } else {
+        if (fetchedPgpKeyDetails.isNewerThan(alreadyEncounteredFetchedPgpKeyDetails)) {
+          uniqueMapOfFetchedPubKeys[fetchedFingerprint] = fetchedPgpKeyDetails
+        }
+      }
+    }
+
+    return uniqueMapOfFetchedPubKeys
+  }
+
+  data class RecipientInfo(
+    val recipientType: Message.RecipientType,
+    val recipientWithPubKeys: RecipientWithPubKeys,
+    val creationTime: Long = System.currentTimeMillis(),
+    var isUpdating: Boolean = true,
+    var isUpdateFailed: Boolean = false,
+    val isModifyingEnabled: Boolean = true
+  )
+
+  companion object {
+    const val PARALLELISM_COUNT = 10
+  }
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/ThreadNotFoundException.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/ThreadNotFoundException.kt
new file mode 100644
index 0000000000..0afe268332
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/ThreadNotFoundException.kt
@@ -0,0 +1,11 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.util.exception
+
+/**
+ * @author Denys Bondarenko
+ */
+class ThreadNotFoundException(message: String) : FlowCryptException(message)
\ No newline at end of file
diff --git a/FlowCrypt/src/main/res/drawable/ic_attach_file_16.xml b/FlowCrypt/src/main/res/drawable/ic_attach_file_16.xml
new file mode 100644
index 0000000000..0a4bd53e04
--- /dev/null
+++ b/FlowCrypt/src/main/res/drawable/ic_attach_file_16.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:tint="@color/gray"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.5,6v11.5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4V5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5v10.5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V6H10v9.5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V5c0,-2.21 -1.79,-4 -4,-4S7,2.79 7,5v12.5c0,3.04 2.46,5.5 5.5,5.5s5.5,-2.46 5.5,-5.5V6h-1.5z" />
+
+</vector>
diff --git a/FlowCrypt/src/main/res/drawable/ic_baseline_edit_draft_24.xml b/FlowCrypt/src/main/res/drawable/ic_baseline_edit_draft_24.xml
new file mode 100644
index 0000000000..e4e0bcc3c5
--- /dev/null
+++ b/FlowCrypt/src/main/res/drawable/ic_baseline_edit_draft_24.xml
@@ -0,0 +1,15 @@
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#888888"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.41,5.8L17.2,4.59c-0.78,-0.78 -2.05,-0.78 -2.83,0l-2.68,2.68L3,15.96V20h4.04l8.74,-8.74 2.63,-2.63c0.79,-0.78 0.79,-2.05 0,-2.83zM6.21,18H5v-1.21l8.66,-8.66 1.21,1.21L6.21,18zM11,20l4,-4h6v4H11z" />
+</vector>
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_message.xml b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
index 92b3b136bb..a2c0ecbd36 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
@@ -1,6 +1,6 @@
 <!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -36,7 +36,6 @@
             android:id="@+id/layoutForm"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:animateLayoutChanges="true"
             android:orientation="vertical">
 
             <FrameLayout
diff --git a/FlowCrypt/src/main/res/layout/fragment_delete_draft.xml b/FlowCrypt/src/main/res/layout/fragment_delete_draft.xml
new file mode 100644
index 0000000000..7beb499eb8
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/fragment_delete_draft.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/default_margin_content">
+
+    <include
+        android:id="@+id/status"
+        layout="@layout/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/layoutProgress"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <include
+        android:id="@+id/layoutProgress"
+        layout="@layout/progress"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/status" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/layout/fragment_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_message_details.xml
index 504e21c919..b85e56046d 100644
--- a/FlowCrypt/src/main/res/layout/fragment_message_details.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_message_details.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -278,6 +278,9 @@
 
                     <com.flowcrypt.email.ui.widget.EmailWebView
                         android:id="@+id/emailWebView"
+                        android:clickable="false"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
diff --git a/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml
new file mode 100644
index 0000000000..8a80c91e85
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/status"
+        layout="@layout/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/progress"
+        layout="@layout/progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/textViewSubject"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/default_margin_medium"
+            android:layout_marginTop="@dimen/default_margin_content"
+            android:layout_marginEnd="@dimen/default_margin_medium"
+            android:ellipsize="end"
+            android:maxLines="5"
+            android:textAlignment="textStart"
+            android:textColor="@color/dark"
+            android:textIsSelectable="true"
+            android:textSize="@dimen/default_text_size_very_big"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginLeft="@dimen/default_margin_medium"
+            tools:text="[FlowCrypt/flowcrypt-security] Unlimited unauthenticated file storage via password protected attachments (#126)" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerViewLabels"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/default_margin_medium"
+            android:layout_marginEnd="@dimen/default_margin_medium"
+            android:layout_marginBottom="@dimen/default_margin_small"
+            android:nestedScrollingEnabled="false"
+            android:overScrollMode="never"
+            app:layoutManager="com.google.android.flexbox.FlexboxLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textViewSubject"
+            tools:itemCount="4"
+            tools:listitem="@layout/item_label_badge"
+            tools:orientation="horizontal" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerViewMessages"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/default_margin_content_small"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/recyclerViewLabels"
+            tools:itemCount="3"
+            tools:listitem="@layout/item_message_in_thread_collapsed" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/layout/fragment_process_message.xml b/FlowCrypt/src/main/res/layout/fragment_process_message.xml
new file mode 100644
index 0000000000..7beb499eb8
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/fragment_process_message.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/default_margin_content">
+
+    <include
+        android:id="@+id/status"
+        layout="@layout/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/layoutProgress"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <include
+        android:id="@+id/layoutProgress"
+        layout="@layout/progress"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/status" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/layout/fragment_thread_details.xml b/FlowCrypt/src/main/res/layout/fragment_thread_details.xml
new file mode 100644
index 0000000000..bbf5736c45
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/fragment_thread_details.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/swipeRefreshLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:enabled="false">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/status"
+            layout="@layout/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <include
+            android:id="@+id/progress"
+            layout="@layout/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerViewMessages"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@+id/layoutReplyButtons"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:itemCount="8"
+            android:clipToPadding="false"
+            android:paddingBottom="64dp"
+            android:scrollbars="vertical"
+            tools:listitem="@layout/item_message_in_thread_collapsed">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+        <include
+            android:id="@+id/layoutReplyButtons"
+            layout="@layout/reply_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/groupContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="layoutReplyButtons,recyclerViewMessages" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/FlowCrypt/src/main/res/layout/fragment_view_pager_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_view_pager_message_details.xml
index 3346e543bc..bfb8db040a 100644
--- a/FlowCrypt/src/main/res/layout/fragment_view_pager_message_details.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_view_pager_message_details.xml
@@ -18,27 +18,5 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <include
-        android:id="@+id/progress"
-        layout="@layout/progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <include
-        android:id="@+id/status"
-        layout="@layout/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/FlowCrypt/src/main/res/layout/fragment_view_pager_thread_details.xml b/FlowCrypt/src/main/res/layout/fragment_view_pager_thread_details.xml
new file mode 100644
index 0000000000..033af95932
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/fragment_view_pager_thread_details.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/viewPager2"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/FlowCrypt/src/main/res/layout/item_message_in_thread_collapsed.xml b/FlowCrypt/src/main/res/layout/item_message_in_thread_collapsed.xml
new file mode 100644
index 0000000000..ead722e0e3
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/item_message_in_thread_collapsed.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingStart="10dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="10dp"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@+id/imageViewAvatar"
+        android:layout_width="@dimen/avatar_size"
+        android:layout_height="@dimen/avatar_size"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_account_default_photo" />
+
+    <TextView
+        android:id="@+id/textViewSender"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/default_margin_content_small"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="middle"
+        android:maxLines="1"
+        android:textColor="?attr/colorOnSurface"
+        android:textSize="@dimen/default_text_size_big"
+        app:layout_constraintEnd_toStartOf="@+id/textViewDate"
+        app:layout_constraintStart_toEndOf="@+id/imageViewAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginLeft="@dimen/default_margin_medium"
+        tools:text="sender@flowcrypt.com" />
+
+    <ImageView
+        android:id="@+id/viewHasAttachments"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/security"
+        android:src="@drawable/ic_attach_file_16"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/tVTo"
+        app:layout_constraintEnd_toStartOf="@+id/viewHasPgp"
+        app:layout_constraintTop_toTopOf="@+id/tVTo"
+        app:tint="@color/gray"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/viewHasPgp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/security"
+        android:src="@drawable/ic_security"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/tVTo"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tVTo"
+        app:tint="@color/colorPrimary"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/textViewDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewEnd"
+        android:textColor="@color/gray"
+        android:textSize="@dimen/default_text_size_medium"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="1:05 PM" />
+
+    <TextView
+        android:id="@+id/tVTo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="textStart"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toStartOf="@+id/textViewDate"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@+id/imageViewAvatar"
+        app:layout_constraintStart_toStartOf="@+id/textViewSender"
+        app:layout_constraintTop_toBottomOf="@+id/textViewSender"
+        tools:text="To me" />
+
+    <TextView
+        android:id="@+id/textViewSnippet"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:ellipsize="end"
+        android:maxLines="3"
+        android:textStyle="italic"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/tVTo"
+        app:layout_constraintTop_toBottomOf="@+id/tVTo"
+        tools:text="Some very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long text from message ..." />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/layout/item_message_in_thread_expanded.xml b/FlowCrypt/src/main/res/layout/item_message_in_thread_expanded.xml
new file mode 100644
index 0000000000..639b610c95
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/item_message_in_thread_expanded.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layoutHeader"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/default_margin_medium"
+        android:paddingTop="@dimen/default_margin_content"
+        android:paddingEnd="@dimen/default_margin_medium"
+        android:paddingBottom="@dimen/default_margin_content"
+        android:animateLayoutChanges="true">
+
+        <ImageView
+            android:id="@+id/imageViewAvatar"
+            android:layout_width="@dimen/avatar_size"
+            android:layout_height="@dimen/avatar_size"
+            android:contentDescription="@string/avatar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_account_default_photo" />
+
+        <TextView
+            android:id="@+id/textViewSenderAddress"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/default_margin_content_small"
+            android:layout_marginEnd="@dimen/default_margin_small"
+            android:ellipsize="middle"
+            android:maxLines="1"
+            android:textColor="?attr/colorOnSurface"
+            android:textSize="@dimen/default_text_size_big"
+            app:layout_constraintEnd_toStartOf="@+id/imageButtonReplyAll"
+            app:layout_constraintStart_toEndOf="@+id/imageViewAvatar"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginLeft="@dimen/default_margin_medium"
+            tools:text="sender@flowcrypt.com" />
+
+        <ImageButton
+            android:id="@+id/imageButtonReplyAll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/default_margin_content_small"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/reply_all"
+            app:layout_constraintEnd_toStartOf="@+id/imageButtonMoreOptions"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginRight="@dimen/default_margin_medium"
+            app:srcCompat="@drawable/ic_reply_all"
+            tools:tint="@color/gray" />
+
+        <ImageButton
+            android:id="@+id/imageButtonMoreOptions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/reply_all"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginRight="@dimen/default_margin_medium"
+            app:srcCompat="@drawable/ic_more_vert_gray_32dp" />
+
+        <ImageButton
+            android:id="@+id/imageButtonDeleteDraft"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/default_margin_content_small"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/delete_draft"
+            android:visibility="gone"
+            app:layout_constraintEnd_toStartOf="@+id/imageButtonEditDraft"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginEnd="0dp"
+            app:srcCompat="@drawable/ic_delete_white_24dp"
+            app:tint="@color/gray" />
+
+        <ImageButton
+            android:id="@+id/imageButtonEditDraft"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/edit_draft"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginRight="@dimen/default_margin_medium"
+            app:srcCompat="@drawable/ic_baseline_edit_draft_24" />
+
+        <ProgressBar
+            android:id="@+id/progressBarSavingDraft"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:indeterminate="true"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginRight="@dimen/default_margin_medium" />
+
+        <TextView
+            android:id="@+id/textViewDate"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/default_text_size_medium"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintBottom_toBottomOf="@+id/tVTo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/textViewSenderAddress"
+            app:layout_constraintTop_toTopOf="@+id/tVTo"
+            tools:text="1:05 PM" />
+
+        <ImageButton
+            android:id="@+id/iBShowDetails"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/default_margin_small"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/details"
+            app:layout_constraintBottom_toBottomOf="@+id/tVTo"
+            app:layout_constraintEnd_toEndOf="@+id/textViewSenderAddress"
+            app:layout_constraintEnd_toStartOf="@+id/textViewDate"
+            app:layout_constraintStart_toEndOf="@+id/tVTo"
+            app:layout_constraintTop_toTopOf="@+id/tVTo"
+            app:srcCompat="@drawable/ic_arrow_drop_down"
+            app:tint="@color/gray" />
+
+        <TextView
+            android:id="@+id/tVTo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin_content_small"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAlignment="textStart"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toStartOf="@+id/iBShowDetails"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@+id/imageViewAvatar"
+            app:layout_constraintStart_toStartOf="@+id/textViewSenderAddress"
+            app:layout_constraintTop_toBottomOf="@+id/textViewSenderAddress"
+            tools:text="To me" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rVMsgDetails"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/default_margin_medium"
+        android:layout_marginEnd="@dimen/default_margin_medium"
+        android:background="@drawable/bg_mime_headers"
+        android:nestedScrollingEnabled="false"
+        android:overScrollMode="never"
+        android:padding="@dimen/default_margin_content_small"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:visibility="gone"
+        tools:itemCount="4"
+        tools:listitem="@layout/item_mime_header"
+        tools:visibility="visible" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rVPgpBadges"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/default_margin_medium"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:layout_marginEnd="@dimen/default_margin_medium"
+        android:nestedScrollingEnabled="false"
+        android:overScrollMode="never"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:itemCount="4"
+        tools:listitem="@layout/item_pgp_badge"
+        tools:orientation="horizontal" />
+
+    <LinearLayout
+        android:id="@+id/layoutSecurityWarnings"
+        android:layout_width="match_parent"
+        android:layout_marginTop="@dimen/default_margin_medium"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <com.flowcrypt.email.ui.widget.EmailWebView
+        android:id="@+id/emailWebView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false">
+
+    </com.flowcrypt.email.ui.widget.EmailWebView>
+
+    <LinearLayout
+        android:id="@+id/layoutMessageParts"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/default_margin_small"
+        android:paddingBottom="@dimen/default_margin_small">
+
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rVAttachments"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:nestedScrollingEnabled="false"
+        android:overScrollMode="never"
+        tools:itemCount="3"
+        tools:listitem="@layout/attachment_item" />
+
+</LinearLayout>
diff --git a/FlowCrypt/src/main/res/layout/item_thread_header.xml b/FlowCrypt/src/main/res/layout/item_thread_header.xml
new file mode 100644
index 0000000000..f1bfbe7bbe
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/item_thread_header.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/default_margin_medium"
+    android:paddingTop="@dimen/default_margin_content"
+    android:paddingEnd="@dimen/default_margin_medium"
+    android:paddingBottom="@dimen/default_margin_content">
+
+    <TextView
+        android:id="@+id/textViewSubject"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="5"
+        android:textAlignment="textStart"
+        android:textColor="@color/dark"
+        android:textIsSelectable="true"
+        android:textSize="@dimen/default_text_size_very_big"
+        android:textStyle="italic"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginLeft="@dimen/default_margin_medium"
+        tools:text="[FlowCrypt/flowcrypt-security] Unlimited unauthenticated file storage via password protected attachments (#126)" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerViewLabels"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:nestedScrollingEnabled="false"
+        android:overScrollMode="never"
+        app:layoutManager="com.google.android.flexbox.FlexboxLayoutManager"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textViewSubject"
+        tools:itemCount="4"
+        tools:listitem="@layout/item_label_badge"
+        tools:orientation="horizontal" />
+
+    <View
+        android:id="@+id/view"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:background="@color/aluminum"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/recyclerViewLabels" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/FlowCrypt/src/main/res/layout/messages_list_item.xml b/FlowCrypt/src/main/res/layout/messages_list_item.xml
index f87679f545..5525cf3f14 100644
--- a/FlowCrypt/src/main/res/layout/messages_list_item.xml
+++ b/FlowCrypt/src/main/res/layout/messages_list_item.xml
@@ -29,7 +29,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content_small"
-        android:ellipsize="end"
+        android:ellipsize="middle"
         android:maxLines="1"
         android:textColor="?attr/itemTitleColor"
         android:textSize="@dimen/default_text_size_big"
diff --git a/FlowCrypt/src/main/res/layout/progress.xml b/FlowCrypt/src/main/res/layout/progress.xml
index 1bd1827ac1..ead209eeac 100644
--- a/FlowCrypt/src/main/res/layout/progress.xml
+++ b/FlowCrypt/src/main/res/layout/progress.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content">
 
     <ProgressBar
@@ -23,6 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_huge"
+        app:layout_goneMarginTop="0dp"
         android:fontFamily="sans-serif-light"
         android:text="@string/loading"
         android:textColor="@color/dark"
@@ -31,4 +33,22 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/progressBar" />
 
+    <ProgressBar
+        android:id="@+id/progressBarHorizontal"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:indeterminate="true"
+        android:indeterminateBehavior="repeat"
+        android:max="100"
+        android:maxHeight="@dimen/default_twice_dip"
+        android:minHeight="@dimen/default_twice_dip"
+        android:progressDrawable="@drawable/download_progress_style"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tVProgressMsg"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/layout/reply_layout.xml b/FlowCrypt/src/main/res/layout/reply_layout.xml
index e8d8627e45..c2780ecca4 100644
--- a/FlowCrypt/src/main/res/layout/reply_layout.xml
+++ b/FlowCrypt/src/main/res/layout/reply_layout.xml
@@ -1,121 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/layoutReplyButton"
+    <com.google.android.material.button.MaterialButton
+        style="@style/AppWidget.ReplyButton"
+        android:id="@+id/replyButton"
         android:layout_width="0dp"
-        android:layout_height="@dimen/layout_height_action_button"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        app:layout_constraintEnd_toStartOf="@+id/layoutReplyAllButton"
+        android:layout_height="wrap_content"
+        android:text="@string/reply_encrypted"
+        app:icon="@drawable/ic_reply"
+        app:layout_constraintEnd_toStartOf="@+id/replyAllButton"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/imageViewReply"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/reply"
-            app:layout_constraintBottom_toTopOf="@+id/textViewReply"
-            app:layout_constraintEnd_toEndOf="@+id/textViewReply"
-            app:layout_constraintStart_toStartOf="@+id/textViewReply"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:srcCompat="@drawable/ic_reply"
-            tools:tint="@color/colorPrimary" />
-
-        <TextView
-            android:id="@+id/textViewReply"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/reply_encrypted"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageViewReply" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/layoutReplyAllButton"
+    <com.google.android.material.button.MaterialButton
+        style="@style/AppWidget.ReplyButton"
+        android:id="@+id/replyAllButton"
         android:layout_width="0dp"
-        android:layout_height="@dimen/layout_height_action_button"
+        android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        app:layout_constraintEnd_toStartOf="@+id/layoutFwdButton"
+        android:text="@string/reply_encrypted"
+        app:icon="@drawable/ic_reply_all"
+        app:layout_constraintEnd_toStartOf="@+id/forwardButton"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/layoutReplyButton"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintStart_toEndOf="@+id/replyButton"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/imageViewReplyAll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:contentDescription="@string/reply_all_encrypted"
-            app:layout_constraintBottom_toTopOf="@+id/textViewReplyAll"
-            app:layout_constraintEnd_toEndOf="@+id/textViewReplyAll"
-            app:layout_constraintStart_toStartOf="@+id/textViewReplyAll"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:srcCompat="@drawable/ic_reply_all"
-            tools:tint="@color/colorPrimary" />
-
-        <TextView
-            android:id="@+id/textViewReplyAll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/reply_all_encrypted"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageViewReplyAll" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/layoutFwdButton"
+    <com.google.android.material.button.MaterialButton
+        style="@style/AppWidget.ReplyButton"
+        android:id="@+id/forwardButton"
         android:layout_width="0dp"
-        android:layout_height="@dimen/layout_height_action_button"
+        android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
+        android:text="@string/forward_encrypted"
+        app:icon="@drawable/ic_forward"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/layoutReplyAllButton"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/imageViewFwd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/reply"
-            app:layout_constraintBottom_toTopOf="@+id/textViewFwd"
-            app:layout_constraintEnd_toEndOf="@+id/textViewFwd"
-            app:layout_constraintStart_toStartOf="@+id/textViewFwd"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:srcCompat="@drawable/ic_forward"
-            tools:tint="@color/colorPrimary" />
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/replyAllButton"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/textViewFwd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/forward_encrypted"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageViewFwd" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/layout/status.xml b/FlowCrypt/src/main/res/layout/status.xml
index 7f19c1b10e..4f0dcc0c9f 100644
--- a/FlowCrypt/src/main/res/layout/status.xml
+++ b/FlowCrypt/src/main/res/layout/status.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -32,4 +32,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/iVStatusImg"
         tools:text="No connection" />
+
+    <Button
+        android:id="@+id/buttonRetry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content"
+        android:text="@string/retry"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tVStatusMsg"
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/menu/fragment_thread_details.xml b/FlowCrypt/src/main/res/menu/fragment_thread_details.xml
new file mode 100644
index 0000000000..d4f8da5bde
--- /dev/null
+++ b/FlowCrypt/src/main/res/menu/fragment_thread_details.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <item
+        android:id="@+id/menuActionArchiveMessage"
+        android:icon="@drawable/selector_ic_archive_white"
+        android:title="@string/archive"
+        android:visible="false"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/menuActionMoveToInbox"
+        android:icon="@drawable/selector_ic_move_to_inbox_white"
+        android:title="@string/move_to_inbox"
+        android:visible="false"
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction" />
+
+    <item
+        android:id="@+id/menuActionDeleteMessage"
+        android:icon="@drawable/selector_ic_delete_white"
+        android:title="@string/delete"
+        android:visible="false"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/menuActionMarkUnread"
+        android:icon="@drawable/selector_ic_mark_unread_white"
+        android:title="@string/mark_unread"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/menuActionMoveToSpam"
+        android:icon="@drawable/selector_ic_to_spam_white"
+        android:title="@string/move_to_spam"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/menuActionMarkAsNotSpam"
+        android:icon="@drawable/selector_ic_from_spam_white"
+        android:title="@string/mark_as_not_spam"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/menuActionChangeLabels"
+        android:icon="@drawable/ic_label_24dp"
+        android:title="@string/change_labels"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/FlowCrypt/src/main/res/navigation/choose_public_key_dialog_graph.xml b/FlowCrypt/src/main/res/navigation/choose_public_key_dialog_graph.xml
index 80c4322ffb..5c78138067 100644
--- a/FlowCrypt/src/main/res/navigation/choose_public_key_dialog_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/choose_public_key_dialog_graph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
@@ -31,5 +31,10 @@
             android:name="returnResultImmediatelyIfSingle"
             android:defaultValue="false"
             app:argType="boolean" />
+        <argument
+            android:name="bundle"
+            android:defaultValue="@null"
+            app:argType="android.os.Bundle"
+            app:nullable="true" />
     </dialog>
 </navigation>
diff --git a/FlowCrypt/src/main/res/navigation/decrypt_attachment_dialog_graph.xml b/FlowCrypt/src/main/res/navigation/decrypt_attachment_dialog_graph.xml
index 1450245b83..d5f0875be1 100644
--- a/FlowCrypt/src/main/res/navigation/decrypt_attachment_dialog_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/decrypt_attachment_dialog_graph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,5 +23,10 @@
             android:name="requestCode"
             android:defaultValue="0"
             app:argType="integer" />
+        <argument
+            android:name="bundle"
+            android:defaultValue="@null"
+            app:argType="android.os.Bundle"
+            app:nullable="true" />
     </dialog>
 </navigation>
diff --git a/FlowCrypt/src/main/res/navigation/delete_draft_dialog_graph.xml b/FlowCrypt/src/main/res/navigation/delete_draft_dialog_graph.xml
new file mode 100644
index 0000000000..405aea731d
--- /dev/null
+++ b/FlowCrypt/src/main/res/navigation/delete_draft_dialog_graph.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/delete_draft_dialog_graph"
+    app:startDestination="@id/deleteDraftDialogFragment">
+
+    <dialog
+        android:id="@+id/deleteDraftDialogFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.dialog.DeleteDraftDialogFragment"
+        tools:layout="@layout/fragment_delete_draft">
+        <argument
+            android:name="requestKey"
+            app:argType="string" />
+        <argument
+            android:name="messageEntityId"
+            app:argType="long" />
+        <argument
+            android:name="uniqueId"
+            app:argType="long" />
+    </dialog>
+</navigation>
diff --git a/FlowCrypt/src/main/res/navigation/download_attachment_dialog_graph.xml b/FlowCrypt/src/main/res/navigation/download_attachment_dialog_graph.xml
index f89d5fecbc..32bf050e81 100644
--- a/FlowCrypt/src/main/res/navigation/download_attachment_dialog_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/download_attachment_dialog_graph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,5 +23,10 @@
             android:name="requestCode"
             android:defaultValue="0"
             app:argType="integer" />
+        <argument
+            android:name="bundle"
+            android:defaultValue="@null"
+            app:argType="android.os.Bundle"
+            app:nullable="true" />
     </dialog>
 </navigation>
diff --git a/FlowCrypt/src/main/res/navigation/fix_need_pass_phrase_dialog_graph.xml b/FlowCrypt/src/main/res/navigation/fix_need_pass_phrase_dialog_graph.xml
index 8f3b6dd0b7..ef4daca053 100644
--- a/FlowCrypt/src/main/res/navigation/fix_need_pass_phrase_dialog_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/fix_need_pass_phrase_dialog_graph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
@@ -37,6 +37,11 @@
             android:name="showKeys"
             android:defaultValue="true"
             app:argType="boolean" />
+        <argument
+            android:name="bundle"
+            android:defaultValue="@null"
+            app:argType="android.os.Bundle"
+            app:nullable="true" />
     </dialog>
 
 </navigation>
diff --git a/FlowCrypt/src/main/res/navigation/import_additional_private_keys_graph.xml b/FlowCrypt/src/main/res/navigation/import_additional_private_keys_graph.xml
index f068fd3fbc..a3395f0926 100644
--- a/FlowCrypt/src/main/res/navigation/import_additional_private_keys_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/import_additional_private_keys_graph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
@@ -19,5 +19,10 @@
         <argument
             android:name="accountEntity"
             app:argType="com.flowcrypt.email.database.entity.AccountEntity" />
+        <argument
+            android:name="bundle"
+            android:defaultValue="@null"
+            app:argType="android.os.Bundle"
+            app:nullable="true" />
     </fragment>
 </navigation>
diff --git a/FlowCrypt/src/main/res/navigation/nav_graph.xml b/FlowCrypt/src/main/res/navigation/nav_graph.xml
index dd99423ab2..4257b24760 100644
--- a/FlowCrypt/src/main/res/navigation/nav_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/nav_graph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,6 +24,8 @@
     <include app:graph="@navigation/decrypt_attachment_dialog_graph" />
     <include app:graph="@navigation/change_gmail_labels_for_single_message_dialog_graph" />
     <include app:graph="@navigation/prepare_downloaded_attachments_for_forwarding_dialog_graph" />
+    <include app:graph="@navigation/process_message_dialog_graph" />
+    <include app:graph="@navigation/delete_draft_dialog_graph" />
 
     <fragment
         android:id="@+id/mainSignInFragment"
@@ -310,6 +312,18 @@
             app:argType="com.flowcrypt.email.api.email.model.LocalFolder" />
     </fragment>
 
+    <fragment
+        android:id="@+id/viewPagerThreadDetailsFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.ViewPagerThreadDetailsFragment"
+        tools:layout="@layout/fragment_message_details">
+        <argument
+            android:name="messageEntityId"
+            app:argType="long" />
+        <argument
+            android:name="localFolder"
+            app:argType="com.flowcrypt.email.api.email.model.LocalFolder" />
+    </fragment>
+
     <fragment
         android:id="@+id/messageDetailsFragment"
         android:name="com.flowcrypt.email.ui.activity.fragment.MessageDetailsFragment"
@@ -326,6 +340,25 @@
             android:defaultValue="false" />
     </fragment>
 
+    <fragment
+        android:id="@+id/threadDetailsFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.ThreadDetailsFragment"
+        tools:layout="@layout/fragment_new_message_details">
+        <argument
+            android:name="messageEntityId"
+            app:argType="long" />
+        <argument
+            android:name="localFolder"
+            app:argType="com.flowcrypt.email.api.email.model.LocalFolder" />
+        <argument
+            android:name="isViewPagerMode"
+            android:defaultValue="false"
+            app:argType="boolean" />
+        <action
+            android:id="@+id/action_threadDetailsFragment_to_viewPagerMessageDetailsFragment"
+            app:destination="@id/viewPagerMessageDetailsFragment" />
+    </fragment>
+
     <fragment
         android:id="@+id/searchBackupsInEmailFragment"
         android:name="com.flowcrypt.email.ui.activity.fragment.SearchBackupsInEmailFragment"
@@ -407,6 +440,9 @@
         <action
             android:id="@+id/action_messagesListFragment_to_viewPagerMessageDetailsFragment"
             app:destination="@id/viewPagerMessageDetailsFragment" />
+        <action
+            android:id="@+id/action_messagesListFragment_to_viewPagerThreadDetailsFragment"
+            app:destination="@id/viewPagerThreadDetailsFragment" />
     </fragment>
 
     <fragment
diff --git a/FlowCrypt/src/main/res/navigation/process_message_dialog_graph.xml b/FlowCrypt/src/main/res/navigation/process_message_dialog_graph.xml
new file mode 100644
index 0000000000..d6fe258604
--- /dev/null
+++ b/FlowCrypt/src/main/res/navigation/process_message_dialog_graph.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/process_message_dialog_graph"
+    app:startDestination="@id/processMessageDialogFragment">
+
+    <dialog
+        android:id="@+id/processMessageDialogFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.dialog.ProcessMessageDialogFragment"
+        tools:layout="@layout/fragment_process_message">
+        <argument
+            android:name="requestKey"
+            app:argType="string" />
+        <argument
+            android:name="requestCode"
+            app:argType="integer" />
+        <argument
+            android:name="message"
+            app:argType="com.flowcrypt.email.ui.adapter.MessagesInThreadListAdapter$Message" />
+        <argument
+            android:name="attachmentId"
+            android:defaultValue="@null"
+            app:argType="string"
+            app:nullable="true" />
+    </dialog>
+</navigation>
diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index 76d783ab08..edd45e2eb1 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="prompt_subject">Тема</string>
     <string name="send">Отправить</string>
@@ -483,7 +488,7 @@
     <string name="add_recipient_to_send_message">Пожалуйста, добавьте хотя бы одного получателя в поле \"Кому\" для отправки этого сообщения</string>
     <string name="send_feedback_failed_hint">При отправке сообщения произошла ошибка. Пожалуйста, напишите нам напрямую на %1$s.\n\nДетали ошибки:\n%2$s</string>
     <string name="edit_draft">Редактировать черновик</string>
-    <string name="draft_saved">Черновик сохранен</string>
+    <string name="saving_draft">Сохранение черновика</string>
     <string name="fetching_drafts_info_failed">Не удалось загрузить информацию о черновиках. Пожалуйста, попробуйте еще раз.</string>
     <string name="no_recipients">(без получателей)</string>
     <string name="could_not_save_draft">Не удалось сохранить черновик\n\nДетали ошибки:\n%1$s</string>
@@ -551,6 +556,11 @@
         <item quantity="few">Удалить эти %1$d сообщения навсегда?</item>
         <item quantity="many">Удалить эти %1$d сообщений навсегда?</item>
     </plurals>
+    <plurals name="delete_thread_question">
+        <item quantity="one">Удалить этот %1$d разговор навсегда?</item>
+        <item quantity="few">Удалить эти %1$d переписки навсегда?</item>
+        <item quantity="many">Удалить эти %1$d переписок навсегда?</item>
+    </plurals>
     <plurals name="found_folder">
         <item quantity="other">Папки не найдены</item>
         <item quantity="one">Найдено %1$d папку</item>
@@ -631,4 +641,13 @@
     <string name="please_specify_your_signature_here">Пожалуйста, укажите здесь свою подпись</string>
     <string name="make_backup_in_the_email_box">Сделайте резервную копию в почтовом ящике</string>
     <string name="make_backup_explanation_text">Сохранить предоставленные закрытые ключи PGP, защищенные парольной фразой, в качестве резервной копии в папке «Входящие». Это поможет Вам получить доступ к Вашим зашифрованным сообщениям с других устройств (при условии предоставление Вашей парольной фразы). Вы можете безопасно оставить его в своем почтовом ящике или заархивировать.\n\nЕсли Вам не нужна такая резервная копия, отключите эту опцию.</string>
+    <string name="draft">Черновик</string>
+    <string name="permissions_granted_and_now_you_can_download_attachments">Разрешения предоставлены и теперь Вы можете загружать вложения.</string>
+    <string name="delete_draft">Удалить черновик?</string>
+    <string name="thread_was_deleted_or_moved">Переписка удалена или перемещена</string>
+    <plurals name="drafts_count">
+        <item quantity="one" tools:ignore="ImpliedQuantity">Черновик</item>
+        <item quantity="few">Черновики(%1$d)</item>
+        <item quantity="many">Черновики(%1$d)</item>
+    </plurals>
 </resources>
diff --git a/FlowCrypt/src/main/res/values-uk/strings.xml b/FlowCrypt/src/main/res/values-uk/strings.xml
index d57149d9a1..88e6ce34d7 100644
--- a/FlowCrypt/src/main/res/values-uk/strings.xml
+++ b/FlowCrypt/src/main/res/values-uk/strings.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="prompt_subject">Тема</string>
     <string name="send">Відправити</string>
@@ -484,7 +489,7 @@
     <string name="add_recipient_to_send_message">Щоб надіслати це повідомлення, додайте принаймні одного одержувача в поле \"Кому\"</string>
     <string name="send_feedback_failed_hint">Під час відправки повідомлення виникла помилка. Будь ласка, напишіть нам безпосередньо на %1$s.\n\nДеталі помилки:\n%2$s</string>
     <string name="edit_draft">Редагувати чорновик</string>
-    <string name="draft_saved">Чорновик збережено</string>
+    <string name="saving_draft">Збереження чорновика</string>
     <string name="fetching_drafts_info_failed">Не вдалося отримати інформацію про чорновики. Будь ласка, спробуйте ще раз.</string>
     <string name="no_recipients">(без отримувачів)</string>
     <string name="could_not_save_draft">Не вдалося зберегти чорновик\n\nДеталі помилки:\n%1$s</string>
@@ -552,6 +557,11 @@
         <item quantity="few">Видалити ці %1$d повідомлення назавжди?</item>
         <item quantity="many">Видалити ці %1$d повідомлень назавжди?</item>
     </plurals>
+    <plurals name="delete_thread_question">
+        <item quantity="one">Видалити цю %1$d бесіду назавжди?</item>
+        <item quantity="few">Видалити ці %1$d бесіди назавжди?</item>
+        <item quantity="many">Видалити ці %1$d бесід назавжди?</item>
+    </plurals>
     <plurals name="found_folder">
         <item quantity="other">Теки відсутні</item>
         <item quantity="one">Знайдено %1$d теку</item>
@@ -632,4 +642,13 @@
     <string name="please_specify_your_signature_here">Будь ласка, вкажіть свій підпис тут</string>
     <string name="make_backup_in_the_email_box">Зробіть резервну копію в електронній скриньці</string>
     <string name="make_backup_explanation_text">Зберегти надані секретні ключі PGP, захищені парольною фразою, як резервну копію в папці «Вхідні». Це допоможе отримати Вам доступ до Ваших зашифрованих повідомлень з інших пристроїв (за умови надання Вашої парольної фрази). Ви можете спокійно залишити його у папці "Вхідні" або заархівувати.\n\nЯкщо Вам не потрібна така резервна копія, вимкніть цю опцію.</string>
+    <string name="draft">Чорновик</string>
+    <string name="permissions_granted_and_now_you_can_download_attachments">Дозволи надано, і тепер ви можете завантажити вкладені файли</string>
+    <string name="delete_draft">Видалити чернетку?</string>
+    <string name="thread_was_deleted_or_moved">Бесіду видалено або переміщено</string>
+    <plurals name="drafts_count">
+        <item quantity="one" tools:ignore="ImpliedQuantity">Чорновик</item>
+        <item quantity="few">Чорновики(%1$d)</item>
+        <item quantity="many">Чорновики(%1$d)</item>
+    </plurals>
 </resources>
diff --git a/FlowCrypt/src/main/res/values/colors.xml b/FlowCrypt/src/main/res/values/colors.xml
index 8ddbbd9c43..cbb1a973b7 100644
--- a/FlowCrypt/src/main/res/values/colors.xml
+++ b/FlowCrypt/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <resources>
diff --git a/FlowCrypt/src/main/res/values/dimens.xml b/FlowCrypt/src/main/res/values/dimens.xml
index fca21f0911..d167c1d503 100644
--- a/FlowCrypt/src/main/res/values/dimens.xml
+++ b/FlowCrypt/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
 <!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
@@ -61,7 +61,6 @@
     <dimen name="width_pgp_message_type_line">8dp</dimen>
     <dimen name="layout_height_message_item">72dp</dimen>
     <dimen name="gone_margin_right_attachment_icon">34dp</dimen>
-    <dimen name="layout_height_action_button">72dp</dimen>
     <dimen name="drop_down_vertical_offset_spinner_from">56dp</dimen>
     <dimen name="drop_down_size">32dp</dimen>
     <dimen name="height_screenshot">150dp</dimen>
diff --git a/FlowCrypt/src/main/res/values/ids.xml b/FlowCrypt/src/main/res/values/ids.xml
index 18c7cdf097..2b5f967cef 100644
--- a/FlowCrypt/src/main/res/values/ids.xml
+++ b/FlowCrypt/src/main/res/values/ids.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <resources>
@@ -14,6 +14,7 @@
     <item name="iVStatusImg" type="id" />
     <item name="tVEmpty" type="id" />
     <item name="iVEmptyImg" type="id" />
+    <item name="buttonRetry" type="id" />
     <item name="webView" type="id" />
 
     <item name="progress_id_start_of_loading_new_messages" type="id" />
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index 012d42e375..1a02331a92 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
@@ -385,6 +385,10 @@
         <item quantity="one">Delete this message permanently?</item>
         <item quantity="other">Delete these %1$d messages permanently?</item>
     </plurals>
+    <plurals name="delete_thread_question">
+        <item quantity="one">Delete this thread permanently?</item>
+        <item quantity="other">Delete these %1$d thread permanently?</item>
+    </plurals>
     <string name="processing">Processing&#8230;</string>
     <string name="or_use_your_credentials_to_connect">or use your credentials to connect</string>
     <string name="advanced_settings">Advanced settings</string>
@@ -569,7 +573,7 @@
     <string name="add_recipient_to_send_message">Please add at least one recipient in \"To\" to send this message</string>
     <string name="send_feedback_failed_hint">There was an error sending message. Our direct email is %1$s.\n\nError details:\n%2$s</string>
     <string name="edit_draft">Edit draft</string>
-    <string name="draft_saved">Draft saved</string>
+    <string name="saving_draft">Saving draft</string>
     <string name="fetching_drafts_info_failed">Fetching drafts info failed. Please try again.</string>
     <string name="no_recipients">(no recipients)</string>
     <string name="could_not_save_draft">Could not save a draft\n\nError details:\n%1$s</string>
@@ -648,4 +652,12 @@
     <string name="please_specify_your_signature_here">Please specify your signature here</string>
     <string name="make_backup_in_the_email_box">Make a backup in the email box</string>
     <string name="make_backup_explanation_text">Save the given passphrase-protected PGP private keys as a backup in the inbox. It will help you access your encrypted messages from other devices (along with your pass phrase). You can safely leave it in your inbox or archive it.\n\nIf you don\'t need to have such a backup, please disable this option.</string>
+    <string name="draft">Draft</string>
+    <string name="permissions_granted_and_now_you_can_download_attachments">The permissions have been granted, and now you can download attachments</string>
+    <string name="delete_draft">Delete draft?</string>
+    <string name="thread_was_deleted_or_moved">The thread was deleted or moved</string>
+    <plurals name="drafts_count">
+        <item quantity="one">Draft</item>
+        <item quantity="other">Drafts(%1$d)</item>
+    </plurals>
 </resources>
diff --git a/FlowCrypt/src/main/res/values/styles.xml b/FlowCrypt/src/main/res/values/styles.xml
index 9f2ed2d341..4bb590f65a 100644
--- a/FlowCrypt/src/main/res/values/styles.xml
+++ b/FlowCrypt/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <!--
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
+  ~ Contributors: denbond7
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
@@ -175,6 +175,17 @@
         <item name="drawableStartCompat">@drawable/selector_list_item_condition</item>
     </style>
 
+    <style name="AppWidget.ReplyButton">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">#808080</item>
+        <item name="android:textSize">@dimen/default_text_size_regular</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="iconGravity">top</item>
+        <item name="iconPadding">0dp</item>
+        <item name="iconSize">24dp</item>
+        <item name="iconTint">@color/colorPrimary</item>
+    </style>
+
     <!-- Text appearance -->
     <style name="AppTextAppearance" tools:ignore="UnusedResources" />
 
diff --git a/FlowCrypt/src/test/java/com/flowcrypt/email/api/email/EmailUtilTest.kt b/FlowCrypt/src/test/java/com/flowcrypt/email/api/email/EmailUtilTest.kt
index cfbde263ca..df899def40 100644
--- a/FlowCrypt/src/test/java/com/flowcrypt/email/api/email/EmailUtilTest.kt
+++ b/FlowCrypt/src/test/java/com/flowcrypt/email/api/email/EmailUtilTest.kt
@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.api.email
@@ -101,10 +101,11 @@ class EmailUtilTest {
     val receivedDate = Instant.now()
     val incomingMessageInfo = IncomingMessageInfo(
       msgEntity = MessageEntity(
-        email = accountEntity.email,
+        account = accountEntity.email,
+        accountType = accountEntity.accountType,
         folder = "INBOX",
         uid = 123,
-        fromAddress = InternetAddress.toString(replyToMIME.from),
+        fromAddresses = InternetAddress.toString(replyToMIME.from),
         receivedDate = receivedDate.toEpochMilli()
       ),
       localFolder = LocalFolder(
diff --git a/script/ci-setup-and-run-emulator.sh b/script/ci-setup-and-run-emulator.sh
index aa13e0a1b3..e442f6132b 100755
--- a/script/ci-setup-and-run-emulator.sh
+++ b/script/ci-setup-and-run-emulator.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+#
+# © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+# Contributors: denbond7
+#
+
 "$ANDROID_HOME/emulator/emulator" -accel-check
 avdmanager list devices #debug
 echo -ne '\n' | avdmanager -v create avd --name ci-emulator --package "system-images;android-34;google_apis;x86_64" --device 'pixel_5' --abi 'google_apis/x86_64'
@@ -7,4 +12,4 @@ cat ~/.android/avd/ci-emulator.avd/config.ini
 # echo "hw.ramSize=3064"  >> ~/.android/avd/ci-emulator.avd/config.ini
 # cat ~/.android/avd/ci-emulator.avd/config.ini
 "$ANDROID_HOME/emulator/emulator" -list-avds #debug
-"$ANDROID_HOME/emulator/emulator" -avd ci-emulator -no-window -no-boot-anim -no-audio -gpu auto -read-only &
+"$ANDROID_HOME/emulator/emulator" -avd ci-emulator -no-snapshot -no-window -no-boot-anim -no-audio -gpu auto -read-only -no-metrics &