diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8cbe1be0f2..24d29ad6ea 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="11" />
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9998..0000000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/25.json b/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/25.json
index 0893da53a5..141f086967 100644
--- a/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/25.json
+++ b/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/25.json
@@ -997,4 +997,4 @@
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '424a5613be14bb041d6a44a5f930b216')"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/26.json b/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/26.json
new file mode 100644
index 0000000000..18bce49d0f
--- /dev/null
+++ b/FlowCrypt/schemas/com.flowcrypt.email.database.FlowCryptRoomDatabase/26.json
@@ -0,0 +1,993 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 26,
+    "identityHash": "0195dbcce64e0e09b2d7b8f95d8b5f2c",
+    "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 NOT NULL, `display_name` TEXT DEFAULT NULL, `is_default` INTEGER DEFAULT 0, `verification_status` TEXT NOT 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": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "display_name",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "is_default",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "verificationStatus",
+            "columnName": "verification_status",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "email_account_type_send_as_email_in_accounts_aliases",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "account_type",
+              "send_as_email"
+            ],
+            "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 DEFAULT 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, `uuid` TEXT DEFAULT NULL, `client_configuration` TEXT DEFAULT NULL, `use_api` 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": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "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": "uuid",
+            "columnName": "uuid",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "clientConfiguration",
+            "columnName": "client_configuration",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "useAPI",
+            "columnName": "use_api",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "email_account_type_in_accounts",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "account_type"
+            ],
+            "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": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "attachment",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `email` 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, `path` TEXT NOT NULL, FOREIGN KEY(`email`, `folder`, `uid`) REFERENCES `messages`(`email`, `folder`, `uid`) 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": "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": "path",
+            "columnName": "path",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "email_uid_folder_path_in_attachment",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "uid",
+              "folder",
+              "path"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `email_uid_folder_path_in_attachment` ON `${TABLE_NAME}` (`email`, `uid`, `folder`, `path`)"
+          },
+          {
+            "name": "email_folder_uid_in_attachment",
+            "unique": false,
+            "columnNames": [
+              "email",
+              "folder",
+              "uid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `email_folder_uid_in_attachment` ON `${TABLE_NAME}` (`email`, `folder`, `uid`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "messages",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email",
+              "folder",
+              "uid"
+            ],
+            "referencedColumns": [
+              "email",
+              "folder",
+              "uid"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "contacts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `email` TEXT NOT NULL, `name` TEXT DEFAULT NULL, `public_key` BLOB DEFAULT NULL, `has_pgp` INTEGER NOT NULL, `client` TEXT DEFAULT NULL, `attested` INTEGER DEFAULT NULL, `fingerprint` TEXT DEFAULT NULL, `long_id` TEXT DEFAULT NULL, `keywords` 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": "publicKey",
+            "columnName": "public_key",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "hasPgp",
+            "columnName": "has_pgp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "client",
+            "columnName": "client",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "attested",
+            "columnName": "attested",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "fingerprint",
+            "columnName": "fingerprint",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "longId",
+            "columnName": "long_id",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "keywords",
+            "columnName": "keywords",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "lastUse",
+            "columnName": "last_use",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "has_pgp_in_contacts",
+            "unique": false,
+            "columnNames": [
+              "has_pgp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `has_pgp_in_contacts` ON `${TABLE_NAME}` (`has_pgp`)"
+          },
+          {
+            "name": "name_in_contacts",
+            "unique": false,
+            "columnNames": [
+              "name"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `name_in_contacts` ON `${TABLE_NAME}` (`name`)"
+          },
+          {
+            "name": "long_id_in_contacts",
+            "unique": false,
+            "columnNames": [
+              "long_id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `long_id_in_contacts` ON `${TABLE_NAME}` (`long_id`)"
+          },
+          {
+            "name": "last_use_in_contacts",
+            "unique": false,
+            "columnNames": [
+              "last_use"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `last_use_in_contacts` ON `${TABLE_NAME}` (`last_use`)"
+          },
+          {
+            "name": "email_in_contacts",
+            "unique": true,
+            "columnNames": [
+              "email"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `email_in_contacts` 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, `public_key` BLOB 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": "publicKey",
+            "columnName": "public_key",
+            "affinity": "BLOB",
+            "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": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "fingerprint_account_account_type_in_keys",
+            "unique": true,
+            "columnNames": [
+              "fingerprint",
+              "account",
+              "account_type"
+            ],
+            "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, 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"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "email_account_type_name_in_labels",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "account_type",
+              "name"
+            ],
+            "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, `email` TEXT NOT NULL, `folder` TEXT NOT NULL, `uid` INTEGER NOT NULL, `received_date` INTEGER DEFAULT NULL, `sent_date` INTEGER DEFAULT NULL, `from_address` TEXT DEFAULT NULL, `to_address` TEXT DEFAULT NULL, `cc_address` TEXT DEFAULT NULL, `subject` TEXT DEFAULT NULL, `flags` TEXT DEFAULT NULL, `raw_message_without_attachments` TEXT DEFAULT NULL, `is_message_has_attachments` INTEGER DEFAULT 0, `is_encrypted` INTEGER DEFAULT -1, `is_new` INTEGER DEFAULT -1, `state` INTEGER DEFAULT -1, `attachments_directory` TEXT, `error_msg` TEXT DEFAULT NULL, `reply_to` TEXT DEFAULT NULL, `thread_id` TEXT DEFAULT NULL, `history_id` TEXT DEFAULT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "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": "fromAddress",
+            "columnName": "from_address",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "toAddress",
+            "columnName": "to_address",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "ccAddress",
+            "columnName": "cc_address",
+            "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": "rawMessageWithoutAttachments",
+            "columnName": "raw_message_without_attachments",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "is_message_has_attachments",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isEncrypted",
+            "columnName": "is_encrypted",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "-1"
+          },
+          {
+            "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_msg",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "replyTo",
+            "columnName": "reply_to",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "threadId",
+            "columnName": "thread_id",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "historyId",
+            "columnName": "history_id",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "email_in_messages",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `email_in_messages` ON `${TABLE_NAME}` (`email`)"
+          },
+          {
+            "name": "email_uid_folder_in_messages",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "uid",
+              "folder"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `email_uid_folder_in_messages` ON `${TABLE_NAME}` (`email`, `uid`, `folder`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "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, '0195dbcce64e0e09b2d7b8f95d8b5f2c')"
+    ]
+  }
+}
\ No newline at end of file
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 57a7a40167..2bc1779a97 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt
@@ -35,7 +35,8 @@ class MigrationTest {
     FlowCryptRoomDatabase.MIGRATION_21_22,
     FlowCryptRoomDatabase.MIGRATION_22_23,
     FlowCryptRoomDatabase.MIGRATION_23_24,
-    FlowCryptRoomDatabase.MIGRATION_24_25
+    FlowCryptRoomDatabase.MIGRATION_24_25,
+    FlowCryptRoomDatabase.MIGRATION_25_26
   )
 
   @get:Rule
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt
index dd8a1190ab..9007800bdc 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt
@@ -9,12 +9,8 @@ import android.app.Activity
 import android.app.Instrumentation
 import android.content.ComponentName
 import android.content.Intent
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.intent.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
@@ -25,6 +21,7 @@ import com.flowcrypt.email.api.retrofit.ApiHelper
 import com.flowcrypt.email.api.retrofit.request.model.InitialLegacySubmitModel
 import com.flowcrypt.email.api.retrofit.response.attester.InitialLegacySubmitResponse
 import com.flowcrypt.email.base.BaseTest
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.rules.ClearAppSettingsRule
 import com.flowcrypt.email.rules.FlowCryptMockWebServerRule
 import com.flowcrypt.email.rules.RetryRule
@@ -77,14 +74,10 @@ class ImportPrivateKeyActivityNoPubOrgRulesTest : BaseTest() {
     .around(ScreenshotTestRule())
 
   @Test
-  fun testErrorWhenImportingKeyFromFile() {
+  @NotReadyForCI
+  fun testErrorWhenImportingKeyFromClipboard() {
     useIntentionFromRunCheckKeysActivity()
     addTextToClipboard("private key", privateKey)
-
-    Espresso.onView(ViewMatchers.withId(R.id.buttonLoadFromClipboard))
-      .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
-      .perform(ViewActions.click())
-
     isDialogWithTextDisplayed(decorView, ERROR_MESSAGE_FROM_ATTESTER)
   }
 
@@ -94,14 +87,7 @@ class ImportPrivateKeyActivityNoPubOrgRulesTest : BaseTest() {
     list.add(keyDetails)
     intent.putExtra(CheckKeysActivity.KEY_EXTRA_UNLOCKED_PRIVATE_KEYS, list)
 
-    Intents.intending(
-      IntentMatchers.hasComponent(
-        ComponentName(
-          getTargetContext(),
-          CheckKeysActivity::class.java
-        )
-      )
-    )
+    intending(hasComponent(ComponentName(getTargetContext(), CheckKeysActivity::class.java)))
       .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, intent))
   }
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityEkmTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityEkmTest.kt
new file mode 100644
index 0000000000..de3e1c69e8
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityEkmTest.kt
@@ -0,0 +1,89 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.ui.activity
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+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 com.flowcrypt.email.R
+import com.flowcrypt.email.TestConstants
+import com.flowcrypt.email.api.retrofit.response.model.OrgRules
+import com.flowcrypt.email.database.entity.KeyEntity
+import com.flowcrypt.email.model.KeyImportDetails
+import com.flowcrypt.email.rules.AddAccountToDatabaseRule
+import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.activity.base.BaseMessageDetailsActivityTest
+import com.flowcrypt.email.util.AccountDaoManager
+import org.hamcrest.Matchers.not
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 8/4/21
+ *         Time: 11:47 AM
+ *         E-mail: DenBond7@gmail.com
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class MessageDetailsActivityEkmTest : BaseMessageDetailsActivityTest() {
+  private val userWithOrgRules = AccountDaoManager.getUserWithOrgRules(
+    OrgRules(
+      flags = listOf(
+        OrgRules.DomainRule.NO_PRV_CREATE,
+        OrgRules.DomainRule.NO_PRV_BACKUP
+      ),
+      customKeyserverUrl = null,
+      keyManagerUrl = "https://keymanagerurl.test",
+      disallowAttesterSearchForDomains = null,
+      enforceKeygenAlgo = null,
+      enforceKeygenExpireMonths = null
+    )
+  )
+  override val addAccountToDatabaseRule = AddAccountToDatabaseRule(userWithOrgRules)
+  private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule(
+    accountEntity = addAccountToDatabaseRule.account,
+    keyPath = "pgp/default@flowcrypt.test_fisrtKey_prv_strong.asc",
+    passphrase = TestConstants.DEFAULT_STRONG_PASSWORD,
+    sourceType = KeyImportDetails.SourceType.EMAIL,
+    passphraseType = KeyEntity.PassphraseType.DATABASE
+  )
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(ClearAppSettingsRule())
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(RetryRule.DEFAULT)
+    .around(activeActivityRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testMissingKeyErrorImportKey() {
+    val details = getMsgInfo(
+      "messages/info/encrypted_msg_info_text_with_missing_key.json",
+      "messages/mime/encrypted_msg_info_text_with_missing_key.txt"
+    )?.msgEntity
+    requireNotNull(details)
+    launchActivity(details)
+    onView(withId(R.id.textViewErrorMessage))
+      .check(matches(withText(getResString(R.string.your_keys_cannot_open_this_message))))
+    onView(withId(R.id.buttonImportPrivateKey))
+      .check(matches(not(isDisplayed())))
+    onView(withId(R.id.buttonSendOwnPublicKey))
+      .check(matches(withText(R.string.inform_sender)))
+  }
+}
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt
index 8673408311..7ac1b975ac 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt
@@ -8,22 +8,13 @@ package com.flowcrypt.email.ui.activity
 import android.app.Activity
 import android.app.Instrumentation
 import android.content.ComponentName
-import android.content.Intent
-import android.os.Environment
-import android.text.TextUtils
-import android.text.format.DateFormat
-import androidx.core.content.FileProvider
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents.intending
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasCategories
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasType
 import androidx.test.espresso.matcher.ViewMatchers.hasTextColor
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -31,12 +22,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
-import androidx.test.internal.runner.junit4.statement.UiThreadStatement
-import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.TestConstants
 import com.flowcrypt.email.base.BaseTest
-import com.flowcrypt.email.junit.annotations.NotReadyForCI
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withEmptyRecyclerView
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withRecyclerViewItemCount
 import com.flowcrypt.email.model.KeyImportDetails
@@ -46,22 +34,15 @@ import com.flowcrypt.email.rules.ClearAppSettingsRule
 import com.flowcrypt.email.rules.RetryRule
 import com.flowcrypt.email.rules.ScreenshotTestRule
 import com.flowcrypt.email.ui.activity.settings.SettingsActivity
-import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.PrivateKeysManager
 import com.flowcrypt.email.util.TestGeneralUtil
-import org.hamcrest.CoreMatchers.hasItem
-import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.not
-import org.hamcrest.core.AllOf.allOf
 import org.junit.Before
 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.io.File
-import java.util.ArrayList
-import java.util.Date
 
 /**
  * @author Denis Bondarenko
@@ -131,84 +112,8 @@ class PrivateKeysListFragmentTest : BaseTest() {
 
   @Test
   fun testShowKeyDetailsScreen() {
-    selectFirstKey()
-  }
-
-  @Test
-  fun testKeyDetailsShowPubKey() {
-    selectFirstKey()
-    val keyDetails = addPrivateKeyToDatabaseRule.pgpKeyDetails
-    onView(withId(R.id.btnShowPubKey))
-      .check(matches(isDisplayed()))
-      .perform(click())
-    onView(withText(keyDetails.publicKey))
-  }
-
-  @Test
-  fun testKeyDetailsCopyToClipBoard() {
-    selectFirstKey()
-    val details = addPrivateKeyToDatabaseRule.pgpKeyDetails
-    onView(withId(R.id.btnCopyToClipboard))
-      .check(matches(isDisplayed()))
-      .perform(click())
-    isToastDisplayed(getResString(R.string.copied))
-    UiThreadStatement.runOnUiThread { checkClipboardText(details.publicKey) }
-  }
-
-  @Test
-  @NotReadyForCI
-  fun testKeyDetailsShowPrivateKey() {
-    selectFirstKey()
-    onView(withId(R.id.btnShowPrKey))
-      .perform(scrollTo())
-      .perform(click())
-    isToastDisplayed(getResString(R.string.see_backups_to_save_your_private_keys))
-  }
-
-  @Test
-  fun testKeyDetailsCheckDetails() {
-    selectFirstKey()
-    val details = addPrivateKeyToDatabaseRule.pgpKeyDetails
-
-    onView(withId(R.id.textViewFingerprint))
-      .check(
-        matches(
-          withText(
-            getHtmlString(
-              getResString(
-                R.string.template_fingerprint,
-                GeneralUtil.doSectionsInText(" ", details.fingerprint, 4)!!
-              )
-            )
-          )
-        )
-      )
-
-    onView(withId(R.id.textViewDate))
-      .check(
-        matches(
-          withText(
-            getHtmlString(
-              getResString(
-                R.string.template_date,
-                DateFormat.getMediumDateFormat(getTargetContext()).format(Date(details.created))
-              )
-            )
-          )
-        )
-      )
-
-    onView(withId(R.id.tVPassPhraseVerification))
-      .check(matches(withText(getResString(R.string.stored_pass_phrase_matched))))
-
-    val emails = ArrayList<String>()
-
-    for (pgpContact in details.pgpContacts) {
-      emails.add(pgpContact.email)
-    }
-
-    onView(withId(R.id.textViewUsers))
-      .check(matches(withText(getResString(R.string.template_users, TextUtils.join(", ", emails)))))
+    onView(withId(R.id.recyclerViewKeys))
+      .perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
   }
 
   @Test
@@ -230,43 +135,4 @@ class PrivateKeysListFragmentTest : BaseTest() {
       .check(matches(withText(getResString(R.string.stored_pass_phrase_mismatch))))
       .check(matches(hasTextColor(R.color.red)))
   }
-
-  @Test
-  fun testKeyDetailsSavePubKeyToFileWhenFileIsNotExist() {
-    selectFirstKey()
-    val details = addPrivateKeyToDatabaseRule.pgpKeyDetails
-
-    val file =
-      File(
-        getTargetContext().getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS),
-        "0x" + details.fingerprint + ".asc"
-      )
-
-    if (file.exists()) {
-      file.delete()
-    }
-
-    val resultData = Intent()
-    resultData.data =
-      FileProvider.getUriForFile(getTargetContext(), Constants.FILE_PROVIDER_AUTHORITY, file)
-
-    intending(
-      allOf(
-        hasAction(Intent.ACTION_CREATE_DOCUMENT),
-        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
-        hasType(Constants.MIME_TYPE_PGP_KEY)
-      )
-    )
-      .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))
-
-    onView(withId(R.id.btnSaveToFile))
-      .check(matches(isDisplayed()))
-      .perform(click())
-    isToastDisplayed(getResString(R.string.saved))
-  }
-
-  private fun selectFirstKey() {
-    onView(withId(R.id.recyclerViewKeys))
-      .perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
-  }
 }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt
index ad6ee97339..6ec2f66cd1 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt
@@ -55,7 +55,7 @@ import org.junit.runner.RunWith
 class SearchMessagesActivityTest : BaseEmailListActivityTest() {
 
   private val accountRule = AddAccountToDatabaseRule(
-    AccountDaoManager.getDefaultAccountDao().copy(areContactsLoaded = true)
+    AccountDaoManager.getDefaultAccountDao().copy(contactsLoaded = true)
   )
 
   override val activityScenarioRule = activityScenarioRule<SearchMessagesActivity>(
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
index 2010ba9e45..aa8bdb3bdf 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
@@ -58,7 +58,7 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class StandardReplyWithServiceInfoAndOneFileTest : BaseTest() {
   private val addAccountToDatabaseRule: AddAccountToDatabaseRule = AddAccountToDatabaseRule(
-    AccountDaoManager.getDefaultAccountDao().copy(areContactsLoaded = true)
+    AccountDaoManager.getDefaultAccountDao().copy(contactsLoaded = true)
   )
   private val attachmentInfo = AttachmentInfo(
     name = "test.txt",
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseMessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseMessageDetailsActivityTest.kt
index 4f8f6b81ae..215474188c 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseMessageDetailsActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseMessageDetailsActivityTest.kt
@@ -36,15 +36,16 @@ abstract class BaseMessageDetailsActivityTest : BaseTest() {
     lazyActivityScenarioRule<MessageDetailsActivity>(launchActivity = false)
   override val activityScenario: ActivityScenario<*>?
     get() = activeActivityRule.scenario
-  protected val addAccountToDatabaseRule = AddAccountToDatabaseRule()
+  protected open val addAccountToDatabaseRule = AddAccountToDatabaseRule()
 
-  protected val localFolder: LocalFolder = LocalFolder(
-    addAccountToDatabaseRule.account.email,
-    fullName = "INBOX",
-    folderAlias = "INBOX",
-    msgCount = 1,
-    attributes = listOf("\\HasNoChildren")
-  )
+  private val localFolder: LocalFolder
+    get() = LocalFolder(
+      addAccountToDatabaseRule.account.email,
+      fullName = "INBOX",
+      folderAlias = "INBOX",
+      msgCount = 1,
+      attributes = listOf("\\HasNoChildren")
+    )
 
   private var idlingForWebView: IdlingResource? = null
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt
new file mode 100644
index 0000000000..f7ebf85b87
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt
@@ -0,0 +1,107 @@
+/*
+ * © 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 androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+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.retrofit.response.model.OrgRules
+import com.flowcrypt.email.base.BaseTest
+import com.flowcrypt.email.database.entity.KeyEntity
+import com.flowcrypt.email.model.KeyImportDetails
+import com.flowcrypt.email.rules.AddAccountToDatabaseRule
+import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.activity.settings.SettingsActivity
+import com.flowcrypt.email.util.AccountDaoManager
+import com.flowcrypt.email.util.PrivateKeysManager
+import com.flowcrypt.email.util.TestGeneralUtil
+import org.hamcrest.Matchers.not
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 8/4/21
+ *         Time: 11:33 AM
+ *         E-mail: DenBond7@gmail.com
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class PrivateKeyDetailsFragmentEkmTest : BaseTest() {
+  override val useIntents: Boolean = true
+  override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
+    TestGeneralUtil.genIntentForNavigationComponent(
+      uri = "flowcrypt://email.flowcrypt.com/settings/keys/details",
+      extras = Bundle().apply {
+        putString(
+          "fingerprint",
+          PrivateKeysManager.getPgpKeyDetailsFromAssets(KEY_PATH).fingerprint
+        )
+      }
+    )
+  )
+
+  private val userWithOrgRules = AccountDaoManager.getUserWithOrgRules(
+    OrgRules(
+      flags = listOf(
+        OrgRules.DomainRule.NO_PRV_CREATE,
+        OrgRules.DomainRule.NO_PRV_BACKUP
+      ),
+      customKeyserverUrl = null,
+      keyManagerUrl = "https://keymanagerurl.test",
+      disallowAttesterSearchForDomains = null,
+      enforceKeygenAlgo = null,
+      enforceKeygenExpireMonths = null
+    )
+  )
+  private val addAccountToDatabaseRule = AddAccountToDatabaseRule(userWithOrgRules)
+  private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule(
+    accountEntity = addAccountToDatabaseRule.account,
+    keyPath = KEY_PATH,
+    passphrase = TestConstants.DEFAULT_SECOND_STRONG_PASSWORD,
+    sourceType = KeyImportDetails.SourceType.EMAIL,
+    passphraseType = KeyEntity.PassphraseType.RAM
+  )
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(ClearAppSettingsRule())
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(RetryRule.DEFAULT)
+    .around(activityScenarioRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testBtnShowPrKeyGone() {
+    onView(withId(R.id.btnShowPrKey))
+      .check(matches(not(isDisplayed())))
+  }
+
+  @Test
+  fun testActionDeleteDisabled() {
+    onView(withId(R.id.menuActionDeleteKey))
+      .check(matches(not(isEnabled())))
+  }
+
+  companion object {
+    private const val KEY_PATH = "pgp/default@flowcrypt.test_secondKey_prv_strong_second.asc"
+  }
+}
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt
new file mode 100644
index 0000000000..78bd4695c4
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt
@@ -0,0 +1,197 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment
+
+import android.app.Activity
+import android.app.Instrumentation
+import android.content.Intent
+import android.os.Bundle
+import android.os.Environment
+import android.text.TextUtils
+import android.text.format.DateFormat
+import androidx.core.content.FileProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasCategories
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasType
+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.rules.activityScenarioRule
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement
+import com.flowcrypt.email.Constants
+import com.flowcrypt.email.R
+import com.flowcrypt.email.base.BaseTest
+import com.flowcrypt.email.junit.annotations.NotReadyForCI
+import com.flowcrypt.email.rules.AddAccountToDatabaseRule
+import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.activity.settings.SettingsActivity
+import com.flowcrypt.email.util.GeneralUtil
+import com.flowcrypt.email.util.PrivateKeysManager
+import com.flowcrypt.email.util.TestGeneralUtil
+import org.hamcrest.Matchers.allOf
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.hasItem
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import java.io.File
+import java.util.ArrayList
+import java.util.Date
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 8/4/21
+ *         Time: 2:38 PM
+ *         E-mail: DenBond7@gmail.com
+ */
+class PrivateKeyDetailsFragmentTest : BaseTest() {
+  private val addAccountToDatabaseRule = AddAccountToDatabaseRule()
+  private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule()
+
+  override val useIntents: Boolean = true
+  override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
+    TestGeneralUtil.genIntentForNavigationComponent(
+      uri = "flowcrypt://email.flowcrypt.com/settings/keys/details",
+      extras = Bundle().apply {
+        putString(
+          "fingerprint",
+          PrivateKeysManager.getPgpKeyDetailsFromAssets(addPrivateKeyToDatabaseRule.keyPath).fingerprint
+        )
+      }
+    )
+  )
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(ClearAppSettingsRule())
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(RetryRule.DEFAULT)
+    .around(activityScenarioRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testKeyDetailsCheckDetails() {
+    val details = addPrivateKeyToDatabaseRule.pgpKeyDetails
+
+    onView(withId(R.id.tVFingerprint))
+      .check(
+        matches(
+          withText(
+            getHtmlString(
+              getResString(
+                R.string.template_fingerprint,
+                GeneralUtil.doSectionsInText(" ", details.fingerprint, 4)!!
+              )
+            )
+          )
+        )
+      )
+
+    onView(withId(R.id.tVDate))
+      .check(
+        matches(
+          withText(
+            getHtmlString(
+              getResString(
+                R.string.template_date,
+                DateFormat.getMediumDateFormat(getTargetContext()).format(Date(details.created))
+              )
+            )
+          )
+        )
+      )
+
+    onView(withId(R.id.tVPassPhraseVerification))
+      .check(matches(withText(getResString(R.string.stored_pass_phrase_matched))))
+
+    val emails = ArrayList<String>()
+
+    for (pgpContact in details.pgpContacts) {
+      emails.add(pgpContact.email)
+    }
+
+    onView(withId(R.id.tVUsers))
+      .check(
+        matches(
+          withText(
+            getResString(
+              R.string.template_users,
+              TextUtils.join(", ", emails)
+            )
+          )
+        )
+      )
+  }
+
+  @Test
+  fun testKeyDetailsShowPubKey() {
+    val keyDetails = addPrivateKeyToDatabaseRule.pgpKeyDetails
+    onView(withId(R.id.btnShowPubKey))
+      .check(matches(isDisplayed()))
+      .perform(click())
+    onView(withText(keyDetails.publicKey))
+  }
+
+  @Test
+  fun testKeyDetailsCopyToClipBoard() {
+    val details = addPrivateKeyToDatabaseRule.pgpKeyDetails
+    onView(withId(R.id.btnCopyToClipboard))
+      .check(matches(isDisplayed()))
+      .perform(click())
+    isToastDisplayed(getResString(R.string.copied))
+    UiThreadStatement.runOnUiThread { checkClipboardText(details.publicKey) }
+  }
+
+  @Test
+  @NotReadyForCI
+  fun testKeyDetailsShowPrivateKey() {
+    onView(withId(R.id.btnShowPrKey))
+      .perform(scrollTo())
+      .perform(click())
+    isToastDisplayed(getResString(R.string.see_backups_to_save_your_private_keys))
+  }
+
+  @Test
+  fun testKeyDetailsSavePubKeyToFileWhenFileIsNotExist() {
+    val details = addPrivateKeyToDatabaseRule.pgpKeyDetails
+
+    val file = File(
+      getTargetContext().getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS),
+      "0x" + details.fingerprint + ".asc"
+    )
+
+    if (file.exists()) {
+      file.delete()
+    }
+
+    val resultData = Intent()
+    resultData.data =
+      FileProvider.getUriForFile(getTargetContext(), Constants.FILE_PROVIDER_AUTHORITY, file)
+
+    intending(
+      allOf(
+        hasAction(Intent.ACTION_CREATE_DOCUMENT),
+        hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
+        hasType(Constants.MIME_TYPE_PGP_KEY)
+      )
+    ).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))
+
+    onView(withId(R.id.btnSaveToFile))
+      .check(matches(isDisplayed()))
+      .perform(click())
+    isToastDisplayed(getResString(R.string.saved))
+  }
+}
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt
new file mode 100644
index 0000000000..7fcd79c3b1
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt
@@ -0,0 +1,89 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+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.retrofit.response.model.OrgRules
+import com.flowcrypt.email.base.BaseTest
+import com.flowcrypt.email.database.entity.KeyEntity
+import com.flowcrypt.email.model.KeyImportDetails
+import com.flowcrypt.email.rules.AddAccountToDatabaseRule
+import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.activity.settings.SettingsActivity
+import com.flowcrypt.email.util.AccountDaoManager
+import com.flowcrypt.email.util.TestGeneralUtil
+import org.hamcrest.Matchers.not
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 8/4/21
+ *         Time: 11:00 AM
+ *         E-mail: DenBond7@gmail.com
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class PrivateKeysListFragmentEkmTest : BaseTest() {
+
+  override val useIntents: Boolean = true
+  override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
+    TestGeneralUtil.genIntentForNavigationComponent(
+      uri = "flowcrypt://email.flowcrypt.com/settings/keys"
+    )
+  )
+
+  private val userWithOrgRules = AccountDaoManager.getUserWithOrgRules(
+    OrgRules(
+      flags = listOf(
+        OrgRules.DomainRule.NO_PRV_CREATE,
+        OrgRules.DomainRule.NO_PRV_BACKUP
+      ),
+      customKeyserverUrl = null,
+      keyManagerUrl = "https://keymanagerurl.test",
+      disallowAttesterSearchForDomains = null,
+      enforceKeygenAlgo = null,
+      enforceKeygenExpireMonths = null
+    )
+  )
+  private val addAccountToDatabaseRule = AddAccountToDatabaseRule(userWithOrgRules)
+  private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule(
+    accountEntity = addAccountToDatabaseRule.account,
+    keyPath = "pgp/default@flowcrypt.test_secondKey_prv_strong_second.asc",
+    passphrase = TestConstants.DEFAULT_SECOND_STRONG_PASSWORD,
+    sourceType = KeyImportDetails.SourceType.EMAIL,
+    passphraseType = KeyEntity.PassphraseType.RAM
+  )
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(ClearAppSettingsRule())
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(RetryRule.DEFAULT)
+    .around(activityScenarioRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testAddNewKeyGone() {
+    onView(withId(R.id.floatActionButtonAddKey))
+      .check(matches(not(isDisplayed())))
+  }
+}
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/AccountDaoManager.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/AccountDaoManager.kt
index 77ea2d0c05..48791c1d8a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/AccountDaoManager.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/AccountDaoManager.kt
@@ -5,6 +5,7 @@
 
 package com.flowcrypt.email.util
 
+import com.flowcrypt.email.api.retrofit.response.model.OrgRules
 import com.flowcrypt.email.database.entity.AccountEntity
 
 /**
@@ -40,6 +41,11 @@ class AccountDaoManager {
       return getUserFromBaseSettings("no_backups@flowcrypt.test")
     }
 
+    fun getUserWithOrgRules(orgRules: OrgRules): AccountEntity {
+      return getUserFromBaseSettings("user_with_org_rules@flowcrypt.test")
+        .copy(clientConfiguration = orgRules)
+    }
+
     private fun getUserFromBaseSettings(user: String): AccountEntity {
       return getDefaultAccountDao().copy(
         email = user,
diff --git a/FlowCrypt/src/androidTest/resources/base_account_settings.json b/FlowCrypt/src/androidTest/resources/base_account_settings.json
index fa239c8bae..b0505437a5 100644
--- a/FlowCrypt/src/androidTest/resources/base_account_settings.json
+++ b/FlowCrypt/src/androidTest/resources/base_account_settings.json
@@ -1,22 +1,22 @@
 {
   "accountType": "flowcrypt.test",
-  "areContactsLoaded": true,
+  "contactsLoaded": true,
   "email": "default@flowcrypt.test",
-  "imapIsUseSslTls": true,
-  "imapIsUseStarttls": false,
+  "imapUseSslTls": true,
+  "imapUseStarttls": false,
   "imapPort": 993,
   "imapServer": "10.0.2.2",
   "isActive": true,
   "isEnabled": true,
   "isRestoreAccessRequired": false,
-  "isShowOnlyEncrypted": false,
+  "showOnlyEncrypted": false,
   "password": "qwerty1234",
-  "smtpIsUseSslTls": false,
-  "smtpIsUseStarttls": true,
+  "smtpUseSslTls": false,
+  "smtpUseStarttls": true,
   "smtpPassword": "qwerty1234",
   "smtpPort": 587,
   "smtpServer": "10.0.2.2",
   "smtpUsername": "default@flowcrypt.test",
-  "useCustomSignForSmtp": true,
+  "smtpUseCustomSign": true,
   "username": "default@flowcrypt.test"
-}
\ No newline at end of file
+}
diff --git a/FlowCrypt/src/androidTest/resources/enterprise_account_enforce_attester_submit.json b/FlowCrypt/src/androidTest/resources/enterprise_account_enforce_attester_submit.json
index 485e69d1dc..7f8fa17f67 100644
--- a/FlowCrypt/src/androidTest/resources/enterprise_account_enforce_attester_submit.json
+++ b/FlowCrypt/src/androidTest/resources/enterprise_account_enforce_attester_submit.json
@@ -8,11 +8,15 @@
   "imapPort": 993,
   "imapOpt": "NONE",
   "imapServer": "10.0.2.2",
-  "useCustomSignForSmtp": false,
+  "smtpUseCustomSign": false,
   "password": "qwerty1234",
   "smtpPort": 587,
   "smtpOpt": "NONE",
   "smtpServer": "10.0.2.2",
   "username": "default@flowcrypt.test",
-  "domainRules": "ENFORCE_ATTESTER_SUBMIT"
-}
\ No newline at end of file
+  "clientConfiguration": {
+    "flags": [
+      "ENFORCE_ATTESTER_SUBMIT"
+    ]
+  }
+}
diff --git a/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_backup.json b/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_backup.json
index a7e925d4c1..1699e52b4d 100644
--- a/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_backup.json
+++ b/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_backup.json
@@ -7,10 +7,14 @@
   "photoUrl": "photoUrl",
   "imapPort": 993,
   "imapServer": "10.0.2.2",
-  "useCustomSignForSmtp": false,
+  "smtpUseCustomSign": false,
   "password": "qwerty1234",
   "smtpPort": 587,
   "smtpServer": "10.0.2.2",
   "username": "default@flowcrypt.test",
-  "domainRules": "NO_PRV_BACKUP"
-}
\ No newline at end of file
+  "clientConfiguration": {
+    "flags": [
+      "NO_PRV_BACKUP"
+    ]
+  }
+}
diff --git a/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_create.json b/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_create.json
index f0eb2cdd8d..f25901d0ea 100644
--- a/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_create.json
+++ b/FlowCrypt/src/androidTest/resources/enterprise_account_no_prv_create.json
@@ -7,10 +7,14 @@
   "photoUrl": "photoUrl",
   "imapPort": 993,
   "imapServer": "10.0.2.2",
-  "useCustomSignForSmtp": false,
+  "smtpUseCustomSign": false,
   "password": "qwerty1234",
   "smtpPort": 587,
   "smtpServer": "10.0.2.2",
   "username": "default@flowcrypt.test",
-  "domainRules": "NO_PRV_CREATE"
-}
\ No newline at end of file
+  "clientConfiguration": {
+    "flags": [
+      "NO_PRV_CREATE"
+    ]
+  }
+}
diff --git a/FlowCrypt/src/androidTest/resources/no.pub@org-rules-test.flowcrypt.com.json b/FlowCrypt/src/androidTest/resources/no.pub@org-rules-test.flowcrypt.com.json
index c895b34a28..1e31b9e010 100644
--- a/FlowCrypt/src/androidTest/resources/no.pub@org-rules-test.flowcrypt.com.json
+++ b/FlowCrypt/src/androidTest/resources/no.pub@org-rules-test.flowcrypt.com.json
@@ -7,10 +7,14 @@
   "photoUrl": "https://lh3.googleusercontent.com/-KqfTq1IKkhw/AAAAAAAAAAI/AAAAAAAAAAA/ACLGyWBZ5bzZtjs2GmmC1ArEskmiLFQWQQ/mo/photo.jpg?sz=128",
   "imapPort": 993,
   "imapServer": "imap.flowcrypt.com",
-  "useCustomSignForSmtp": false,
+  "smtpUseCustomSign": false,
   "password": "qwerty1234",
   "smtpPort": 25,
   "smtpServer": "smtp.flowcrypt.com",
   "username": "no.pub@org-rules-test.flowcrypt.com",
-  "domainRules": "ENFORCE_ATTESTER_SUBMIT"
-}
\ No newline at end of file
+  "clientConfiguration": {
+    "flags": [
+      "ENFORCE_ATTESTER_SUBMIT"
+    ]
+  }
+}
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 4e1791b903..48e079d542 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
@@ -59,7 +59,10 @@ import java.io.ByteArrayInputStream
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
+import java.util.Properties
+import java.util.UUID
 import javax.activation.DataHandler
 import javax.mail.BodyPart
 import javax.mail.FetchProfile
@@ -84,8 +87,6 @@ import javax.mail.search.SearchTerm
 import javax.mail.search.StringTerm
 import javax.mail.search.SubjectTerm
 import javax.mail.util.ByteArrayDataSource
-import kotlin.collections.HashMap
-import kotlin.collections.HashSet
 
 /**
  * @author Denis Bondarenko
@@ -940,7 +941,7 @@ class EmailUtil {
      * @return A generated [SearchTerm].
      */
     fun generateSearchTerm(account: AccountEntity, localFolder: LocalFolder): SearchTerm {
-      val isEncryptedModeEnabled = account.isShowOnlyEncrypted
+      val isEncryptedModeEnabled = account.showOnlyEncrypted
 
       if (isEncryptedModeEnabled == true) {
         val searchTerm = genEncryptedMsgsSearchTerm(account)
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 3f755c3c6d..24d40ce759 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
@@ -235,7 +235,7 @@ class GmailApiHelper {
         request.labelIds = listOf(localFolder.fullName)
       }
 
-      if (accountEntity.isShowOnlyEncrypted == true) {
+      if (accountEntity.showOnlyEncrypted == true) {
         request.q =
           (EmailUtil.genEncryptedMsgsSearchTerm(accountEntity) as? GmailRawSearchTerm)?.pattern
       }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthCredentials.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthCredentials.kt
index 2983389c58..0518c5b118 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthCredentials.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthCredentials.kt
@@ -99,17 +99,17 @@ data class AuthCredentials constructor(
       with(accountEntity) {
         var imapOpt: SecurityType.Option = SecurityType.Option.NONE
 
-        if (imapIsUseSslTls == true) {
+        if (imapUseSslTls == true) {
           imapOpt = SecurityType.Option.SSL_TLS
-        } else if (imapIsUseStarttls == true) {
+        } else if (imapUseStarttls == true) {
           imapOpt = SecurityType.Option.STARTLS
         }
 
         var smtpOpt: SecurityType.Option = SecurityType.Option.NONE
 
-        if (smtpIsUseSslTls == true) {
+        if (smtpUseSslTls == true) {
           smtpOpt = SecurityType.Option.SSL_TLS
-        } else if (smtpIsUseStarttls == true) {
+        } else if (smtpUseStarttls == true) {
           smtpOpt = SecurityType.Option.STARTLS
         }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/SmtpProtocolUtil.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/SmtpProtocolUtil.kt
index 156aa67b26..bc851d112f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/SmtpProtocolUtil.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/SmtpProtocolUtil.kt
@@ -65,7 +65,7 @@ class SmtpProtocolUtil {
           val userName: String?
           var password: String?
 
-          if (accountEntity.useCustomSignForSmtp == true) {
+          if (accountEntity.smtpUseCustomSign == true) {
             userName = accountEntity.smtpUsername
             password = accountEntity.smtpPassword
           } else {
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 4a55be82c1..3c8d24351a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/FlowCryptRoomDatabase.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/FlowCryptRoomDatabase.kt
@@ -16,6 +16,7 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.sqlite.db.SupportSQLiteDatabase
 import com.flowcrypt.email.api.email.JavaEmailConstants
+import com.flowcrypt.email.database.converters.OrgRulesConverter
 import com.flowcrypt.email.database.converters.PassphraseTypeConverter
 import com.flowcrypt.email.database.dao.AccountAliasesDao
 import com.flowcrypt.email.database.dao.AccountDao
@@ -59,7 +60,7 @@ import org.pgpainless.key.OpenPgpV4Fingerprint
   ],
   version = FlowCryptRoomDatabase.DB_VERSION
 )
-@TypeConverters(PassphraseTypeConverter::class)
+@TypeConverters(PassphraseTypeConverter::class, OrgRulesConverter::class)
 abstract class FlowCryptRoomDatabase : RoomDatabase() {
   abstract fun msgDao(): MessageDao
 
@@ -84,7 +85,7 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
 
   companion object {
     const val DB_NAME = "flowcrypt.db"
-    const val DB_VERSION = 25
+    const val DB_VERSION = 26
 
     private val MIGRATION_1_3 = object : FlowCryptMigration(1, 3) {
       override fun doMigration(database: SupportSQLiteDatabase) {
@@ -396,6 +397,121 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
       }
     }
 
+    @VisibleForTesting
+    val MIGRATION_25_26 = object : FlowCryptMigration(25, 26) {
+      override fun doMigration(database: SupportSQLiteDatabase) {
+        //create temp table with existed 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 'accounts' with modified structure
+        database.execSQL(
+          "CREATE TABLE IF NOT EXISTS `accounts` (" +
+              "`_id` INTEGER PRIMARY KEY AUTOINCREMENT," +
+              " `email` TEXT NOT NULL," +
+              " `account_type` TEXT DEFAULT 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," +
+              " `uuid` TEXT DEFAULT NULL," +
+              " `client_configuration` TEXT DEFAULT NULL," +
+              " `use_api` 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 accounts table with existed data.
+        database.execSQL(
+          "INSERT INTO accounts(" +
+              "_id," +
+              " email," +
+              " account_type," +
+              " display_name," +
+              " given_name," +
+              " family_name," +
+              " photo_url," +
+              " is_enabled," +
+              " is_active," +
+              " username," +
+              " password," +
+              " imap_server," +
+              " imap_port," +
+              " imap_use_ssl_tls," +
+              " imap_use_starttls," +
+              " imap_auth_mechanisms," +
+              " smtp_server," +
+              " smtp_port," +
+              " smtp_use_ssl_tls," +
+              " smtp_use_starttls," +
+              " smtp_auth_mechanisms," +
+              " smtp_use_custom_sign," +
+              " smtp_username," +
+              " smtp_password," +
+              " contacts_loaded," +
+              " show_only_encrypted," +
+              " uuid," +
+              " use_api" +
+              ") SELECT" +
+              " _id," +
+              " email," +
+              " account_type," +
+              " display_name," +
+              " given_name," +
+              " family_name," +
+              " photo_url," +
+              " is_enable," +
+              " is_active," +
+              " username," +
+              " password," +
+              " imap_server," +
+              " imap_port," +
+              " imap_is_use_ssl_tls," +
+              " imap_is_use_starttls," +
+              " imap_auth_mechanisms," +
+              " smtp_server," +
+              " smtp_port," +
+              " smtp_is_use_ssl_tls," +
+              " smtp_is_use_starttls," +
+              " smtp_auth_mechanisms," +
+              " smtp_is_use_custom_sign," +
+              " smtp_username," +
+              " smtp_password," +
+              " ic_contacts_loaded," +
+              " is_show_only_encrypted," +
+              " uuid," +
+              " use_api" +
+              " FROM accounts_temp;"
+        )
+        //drop temp table
+        database.execSQL("DROP TABLE IF EXISTS accounts_temp;")
+      }
+    }
+
     // Singleton prevents multiple instances of database opening at the same time.
     @Volatile
     private var INSTANCE: FlowCryptRoomDatabase? = null
@@ -434,7 +550,8 @@ abstract class FlowCryptRoomDatabase : RoomDatabase() {
           MIGRATION_21_22,
           MIGRATION_22_23,
           MIGRATION_23_24,
-          MIGRATION_24_25
+          MIGRATION_24_25,
+          MIGRATION_25_26
         ).build()
         INSTANCE = instance
         return instance
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/converters/OrgRulesConverter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/converters/OrgRulesConverter.kt
new file mode 100644
index 0000000000..d8c23d1bb1
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/converters/OrgRulesConverter.kt
@@ -0,0 +1,43 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.database.converters
+
+import androidx.room.TypeConverter
+import com.flowcrypt.email.api.retrofit.response.model.OrgRules
+import com.google.gson.GsonBuilder
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 7/29/21
+ *         Time: 2:19 PM
+ *         E-mail: DenBond7@gmail.com
+ */
+class OrgRulesConverter {
+  private val gson = GsonBuilder()
+    .excludeFieldsWithoutExposeAnnotation()
+    .serializeNulls()
+    .create()
+
+  @TypeConverter
+  fun fromOrgRules(orgRules: OrgRules?): String? {
+    return try {
+      orgRules?.let { gson.toJson(orgRules) }
+    } catch (e: Exception) {
+      e.printStackTrace()
+      null
+    }
+  }
+
+  @TypeConverter
+  fun toOrgRules(orgRulesJson: String?): OrgRules? {
+    return try {
+      orgRulesJson?.let { gson.fromJson(it, OrgRules::class.java) }
+    } catch (e: Exception) {
+      e.printStackTrace()
+      null
+    }
+  }
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AccountDao.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AccountDao.kt
index 5dad9ac6d8..027e1b0a2c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AccountDao.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/AccountDao.kt
@@ -186,13 +186,13 @@ abstract class AccountDao : BaseDao<AccountEntity> {
         smtpPassword = encryptedSmtpPassword,
         imapServer = authCredentials.imapServer.toLowerCase(Locale.US),
         imapPort = authCredentials.imapPort,
-        imapIsUseSslTls = authCredentials.imapOpt === SecurityType.Option.SSL_TLS,
-        imapIsUseStarttls = authCredentials.imapOpt === SecurityType.Option.STARTLS,
+        imapUseSslTls = authCredentials.imapOpt === SecurityType.Option.SSL_TLS,
+        imapUseStarttls = authCredentials.imapOpt === SecurityType.Option.STARTLS,
         smtpServer = authCredentials.smtpServer.toLowerCase(Locale.US),
         smtpPort = authCredentials.smtpPort,
-        smtpIsUseSslTls = authCredentials.smtpOpt === SecurityType.Option.SSL_TLS,
-        smtpIsUseStarttls = authCredentials.smtpOpt === SecurityType.Option.STARTLS,
-        useCustomSignForSmtp = authCredentials.hasCustomSignInForSmtp,
+        smtpUseSslTls = authCredentials.smtpOpt === SecurityType.Option.SSL_TLS,
+        smtpUseStarttls = authCredentials.smtpOpt === SecurityType.Option.STARTLS,
+        smtpUseCustomSign = authCredentials.hasCustomSignInForSmtp,
         smtpUsername = authCredentials.smtpSigInUsername
       )
     )
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 61e1d1e9b4..8969a6bb09 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
@@ -44,53 +44,36 @@ data class AccountEntity constructor(
   @ColumnInfo(name = "given_name", defaultValue = "NULL") val givenName: String? = null,
   @ColumnInfo(name = "family_name", defaultValue = "NULL") val familyName: String? = null,
   @ColumnInfo(name = "photo_url", defaultValue = "NULL") val photoUrl: String? = null,
-  @ColumnInfo(name = "is_enable", defaultValue = "1") val isEnabled: Boolean? = true,
+  @ColumnInfo(name = "is_enabled", defaultValue = "1") val isEnabled: Boolean? = true,
   @ColumnInfo(name = "is_active", defaultValue = "0") val isActive: Boolean? = false,
   val username: String,
   val password: String,
   @ColumnInfo(name = "imap_server") val imapServer: String,
   @ColumnInfo(name = "imap_port", defaultValue = "143") val imapPort: Int? = 143,
-  @ColumnInfo(
-    name = "imap_is_use_ssl_tls",
-    defaultValue = "0"
-  ) val imapIsUseSslTls: Boolean? = false,
-  @ColumnInfo(
-    name = "imap_is_use_starttls",
-    defaultValue = "0"
-  ) val imapIsUseStarttls: Boolean? = false,
+  @ColumnInfo(name = "imap_use_ssl_tls", defaultValue = "0") val imapUseSslTls: Boolean? = false,
+  @ColumnInfo(name = "imap_use_starttls", defaultValue = "0") val imapUseStarttls: Boolean? = false,
   @ColumnInfo(name = "imap_auth_mechanisms") val imapAuthMechanisms: String? = null,
   @ColumnInfo(name = "smtp_server") val smtpServer: String,
   @ColumnInfo(name = "smtp_port", defaultValue = "25") val smtpPort: Int? = 25,
-  @ColumnInfo(
-    name = "smtp_is_use_ssl_tls",
-    defaultValue = "0"
-  ) val smtpIsUseSslTls: Boolean? = false,
-  @ColumnInfo(
-    name = "smtp_is_use_starttls",
-    defaultValue = "0"
-  ) val smtpIsUseStarttls: Boolean? = false,
+  @ColumnInfo(name = "smtp_use_ssl_tls", defaultValue = "0") val smtpUseSslTls: Boolean? = false,
+  @ColumnInfo(name = "smtp_use_starttls", defaultValue = "0") val smtpUseStarttls: Boolean? = false,
   @ColumnInfo(name = "smtp_auth_mechanisms") val smtpAuthMechanisms: String? = null,
   @ColumnInfo(
-    name = "smtp_is_use_custom_sign",
+    name = "smtp_use_custom_sign",
     defaultValue = "0"
-  ) val useCustomSignForSmtp: Boolean? = false,
+  ) val smtpUseCustomSign: Boolean? = false,
   @ColumnInfo(name = "smtp_username", defaultValue = "NULL") val smtpUsername: String? = null,
   @ColumnInfo(name = "smtp_password", defaultValue = "NULL") val smtpPassword: String? = null,
+  @ColumnInfo(name = "contacts_loaded", defaultValue = "0") val contactsLoaded: Boolean? = false,
   @ColumnInfo(
-    name = "ic_contacts_loaded",
+    name = "show_only_encrypted",
     defaultValue = "0"
-  ) val areContactsLoaded: Boolean? = false,
-  @ColumnInfo(
-    name = "is_show_only_encrypted",
-    defaultValue = "0"
-  ) val isShowOnlyEncrypted: Boolean? = false,
+  ) val showOnlyEncrypted: Boolean? = false,
   @ColumnInfo(defaultValue = "NULL") val uuid: String? = null,
-  @ColumnInfo(name = "domain_rules", defaultValue = "NULL") val domainRules: String? = null,
-  @Deprecated("Don't use this field. Should be removed in the next database upgrading")
   @ColumnInfo(
-    name = "is_restore_access_required",
-    defaultValue = "0"
-  ) val isRestoreAccessRequired: Boolean? = false,
+    name = "client_configuration",
+    defaultValue = "NULL"
+  ) val clientConfiguration: OrgRules? = null,
   @ColumnInfo(name = "use_api", defaultValue = "0") val useAPI: Boolean = false
 ) : Parcelable {
 
@@ -103,8 +86,9 @@ data class AccountEntity constructor(
   val useOAuth2: Boolean
     get() = JavaEmailConstants.AUTH_MECHANISMS_XOAUTH2 == imapAuthMechanisms
 
-  constructor(googleSignInAccount: GoogleSignInAccount, uuid: String? = null,
-              domainRules: List<OrgRules.DomainRule>? = null) :
+  constructor(
+    googleSignInAccount: GoogleSignInAccount, uuid: String? = null, orgRules: OrgRules? = null
+  ) :
       this(
         email = googleSignInAccount.email!!.toLowerCase(Locale.US),
         accountType = googleSignInAccount.account?.type?.toLowerCase(Locale.US),
@@ -118,26 +102,25 @@ data class AccountEntity constructor(
         password = "",
         imapServer = GmailConstants.GMAIL_IMAP_SERVER,
         imapPort = GmailConstants.GMAIL_IMAP_PORT,
-        imapIsUseSslTls = true,
-        imapIsUseStarttls = false,
+        imapUseSslTls = true,
+        imapUseStarttls = false,
         imapAuthMechanisms = JavaEmailConstants.AUTH_MECHANISMS_XOAUTH2,
         smtpServer = GmailConstants.GMAIL_SMTP_SERVER,
         smtpPort = GmailConstants.GMAIL_SMTP_PORT,
-        smtpIsUseSslTls = true,
-        smtpIsUseStarttls = false,
+        smtpUseSslTls = true,
+        smtpUseStarttls = false,
         smtpAuthMechanisms = JavaEmailConstants.AUTH_MECHANISMS_XOAUTH2,
-        useCustomSignForSmtp = false,
+        smtpUseCustomSign = false,
         smtpUsername = null,
         smtpPassword = null,
-        areContactsLoaded = false,
-        isShowOnlyEncrypted = false,
+        contactsLoaded = false,
+        showOnlyEncrypted = false,
         uuid = uuid,
-        domainRules = domainRules?.joinToString(),
-        isRestoreAccessRequired = false,
+        clientConfiguration = orgRules,
         useAPI = FlavorSettings.isGMailAPIEnabled()
       )
 
-  constructor(authCredentials: AuthCredentials, uuid: String? = null, domainRules: List<OrgRules.DomainRule>? = null) :
+  constructor(authCredentials: AuthCredentials, uuid: String? = null, orgRules: OrgRules? = null) :
       this(
         email = authCredentials.email.toLowerCase(Locale.US),
         accountType = authCredentials.email.substring(authCredentials.email.indexOf('@') + 1)
@@ -152,22 +135,21 @@ data class AccountEntity constructor(
         password = authCredentials.password,
         imapServer = authCredentials.imapServer.toLowerCase(Locale.US),
         imapPort = authCredentials.imapPort,
-        imapIsUseSslTls = authCredentials.imapOpt === SecurityType.Option.SSL_TLS,
-        imapIsUseStarttls = authCredentials.imapOpt === SecurityType.Option.STARTLS,
+        imapUseSslTls = authCredentials.imapOpt === SecurityType.Option.SSL_TLS,
+        imapUseStarttls = authCredentials.imapOpt === SecurityType.Option.STARTLS,
         imapAuthMechanisms = if (authCredentials.useOAuth2) JavaEmailConstants.AUTH_MECHANISMS_XOAUTH2 else null,
         smtpServer = authCredentials.smtpServer.toLowerCase(Locale.US),
         smtpPort = authCredentials.smtpPort,
-        smtpIsUseSslTls = authCredentials.smtpOpt === SecurityType.Option.SSL_TLS,
-        smtpIsUseStarttls = authCredentials.smtpOpt === SecurityType.Option.STARTLS,
+        smtpUseSslTls = authCredentials.smtpOpt === SecurityType.Option.SSL_TLS,
+        smtpUseStarttls = authCredentials.smtpOpt === SecurityType.Option.STARTLS,
         smtpAuthMechanisms = if (authCredentials.useOAuth2) JavaEmailConstants.AUTH_MECHANISMS_XOAUTH2 else null,
-        useCustomSignForSmtp = authCredentials.hasCustomSignInForSmtp,
+        smtpUseCustomSign = authCredentials.hasCustomSignInForSmtp,
         smtpUsername = authCredentials.smtpSigInUsername,
         smtpPassword = authCredentials.smtpSignInPassword,
-        areContactsLoaded = false,
-        isShowOnlyEncrypted = false,
+        contactsLoaded = false,
+        showOnlyEncrypted = false,
         uuid = uuid,
-        domainRules = domainRules?.joinToString(),
-        isRestoreAccessRequired = false,
+        clientConfiguration = orgRules,
         useAPI = false
       )
 
@@ -185,22 +167,21 @@ data class AccountEntity constructor(
         password = "",
         imapServer = "",
         imapPort = 0,
-        imapIsUseSslTls = true,
-        imapIsUseStarttls = false,
+        imapUseSslTls = true,
+        imapUseStarttls = false,
         imapAuthMechanisms = null,
         smtpServer = "",
         smtpPort = 0,
-        smtpIsUseSslTls = true,
-        smtpIsUseStarttls = false,
+        smtpUseSslTls = true,
+        smtpUseStarttls = false,
         smtpAuthMechanisms = "",
-        useCustomSignForSmtp = false,
+        smtpUseCustomSign = false,
         smtpUsername = null,
         smtpPassword = null,
-        areContactsLoaded = false,
-        isShowOnlyEncrypted = false,
+        contactsLoaded = false,
+        showOnlyEncrypted = false,
         uuid = null,
-        domainRules = null,
-        isRestoreAccessRequired = false,
+        clientConfiguration = null,
         useAPI = false
       )
 
@@ -232,26 +213,17 @@ data class AccountEntity constructor(
     source.readValue(Boolean::class.java.classLoader) as Boolean?,
     source.readValue(Boolean::class.java.classLoader) as Boolean?,
     source.readString(),
-    source.readString(),
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
+    source.readParcelable(OrgRules::class.java.classLoader),
     source.readValue(Boolean::class.java.classLoader) as Boolean
   )
 
-  fun domainRulesList(): List<String> {
-    return if (domainRules.isNullOrEmpty()) {
-      emptyList()
-    } else {
-      domainRules.split(",").map { it.trim() }
-    }
-  }
-
   fun imapOpt(): SecurityType.Option {
     return when {
-      imapIsUseSslTls == true -> {
+      imapUseSslTls == true -> {
         SecurityType.Option.SSL_TLS
       }
 
-      imapIsUseStarttls == true -> {
+      imapUseStarttls == true -> {
         SecurityType.Option.STARTLS
       }
 
@@ -261,11 +233,11 @@ data class AccountEntity constructor(
 
   fun smtpOpt(): SecurityType.Option {
     return when {
-      smtpIsUseSslTls == true -> {
+      smtpUseSslTls == true -> {
         SecurityType.Option.SSL_TLS
       }
 
-      smtpIsUseStarttls == true -> {
+      smtpUseStarttls == true -> {
         SecurityType.Option.STARTLS
       }
 
@@ -274,8 +246,7 @@ data class AccountEntity constructor(
   }
 
   fun isRuleExist(domainRule: OrgRules.DomainRule): Boolean {
-    val rules = domainRulesList()
-    return domainRule.name in rules
+    return clientConfiguration?.hasRule(domainRule) ?: false
   }
 
   override fun describeContents() = 0
@@ -294,22 +265,21 @@ data class AccountEntity constructor(
     writeString(password)
     writeString(imapServer)
     writeValue(imapPort)
-    writeValue(imapIsUseSslTls)
-    writeValue(imapIsUseStarttls)
+    writeValue(imapUseSslTls)
+    writeValue(imapUseStarttls)
     writeString(imapAuthMechanisms)
     writeString(smtpServer)
     writeValue(smtpPort)
-    writeValue(smtpIsUseSslTls)
-    writeValue(smtpIsUseStarttls)
+    writeValue(smtpUseSslTls)
+    writeValue(smtpUseStarttls)
     writeString(smtpAuthMechanisms)
-    writeValue(useCustomSignForSmtp)
+    writeValue(smtpUseCustomSign)
     writeString(smtpUsername)
     writeString(smtpPassword)
-    writeValue(areContactsLoaded)
-    writeValue(isShowOnlyEncrypted)
+    writeValue(contactsLoaded)
+    writeValue(showOnlyEncrypted)
     writeString(uuid)
-    writeString(domainRules)
-    writeValue(isRestoreAccessRequired)
+    writeParcelable(clientConfiguration, flags)
     writeValue(useAPI)
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/AccountViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/AccountViewModel.kt
index d5ec7a234a..b6128533dd 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/AccountViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/AccountViewModel.kt
@@ -79,7 +79,7 @@ open class AccountViewModel(application: Application) : RoomBasicViewModel(appli
             accountEntity.copy(
               id = existedAccount.id,
               uuid = existedAccount.uuid,
-              domainRules = existedAccount.domainRules
+              clientConfiguration = existedAccount.clientConfiguration
             )
           )
         }
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 30ec989fbc..ee7f7e7a7e 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
@@ -375,7 +375,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
         else -> countOfAlreadyLoadedMsgs
       }
 
-      val isEncryptedModeEnabled = accountEntity.isShowOnlyEncrypted
+      val isEncryptedModeEnabled = accountEntity.showOnlyEncrypted
       var foundMsgs: Array<Message> = emptyArray()
       var msgsCount = 0
 
@@ -493,7 +493,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     val email = account.email
     val folder = localFolder.fullName
 
-    val isEncryptedModeEnabled = account.isShowOnlyEncrypted ?: false
+    val isEncryptedModeEnabled = account.showOnlyEncrypted ?: false
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
       email = email,
@@ -519,7 +519,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     val email = account.email
     val folder = localFolder.fullName
 
-    val isEncryptedModeEnabled = account.isShowOnlyEncrypted ?: false
+    val isEncryptedModeEnabled = account.showOnlyEncrypted ?: false
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
       email = email,
@@ -734,7 +734,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     remoteFolder: IMAPFolder, msgs: Array<Message>
   ) = withContext(Dispatchers.IO) {
     val email = account.email
-    val isEncryptedModeEnabled = account.isShowOnlyEncrypted ?: false
+    val isEncryptedModeEnabled = account.showOnlyEncrypted ?: false
     val searchLabel = SearchMessagesActivity.SEARCH_FOLDER_NAME
 
     val msgEntities = MessageEntity.genMessageEntities(
@@ -763,7 +763,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
     val email = account.email
     val label = localFolder.fullName
 
-    val isEncryptedModeEnabled = account.isShowOnlyEncrypted ?: false
+    val isEncryptedModeEnabled = account.showOnlyEncrypted ?: false
     val msgEntities = MessageEntity.genMessageEntities(
       context = getApplication(),
       email = email,
@@ -844,7 +844,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
         newestCachedUID.toLong()
       )
 
-      val newMsgsAfterLastInLocalCache = if (accountEntity.isShowOnlyEncrypted == true) {
+      val newMsgsAfterLastInLocalCache = if (accountEntity.showOnlyEncrypted == true) {
         val foundMsgs = imapFolder.search(EmailUtil.genEncryptedMsgsSearchTerm(accountEntity))
 
         val fetchProfile = FetchProfile()
@@ -907,7 +907,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
 
     val newCandidates = EmailUtil.genNewCandidates(msgsUIDs, remoteFolder, newMsgs)
 
-    val isEncryptedModeEnabled = accountEntity.isShowOnlyEncrypted ?: false
+    val isEncryptedModeEnabled = accountEntity.showOnlyEncrypted ?: false
     val isNew = !GeneralUtil.isAppForegrounded() && folderType === FoldersManager.FolderType.INBOX
 
     val msgEntities = MessageEntity.genMessageEntities(
@@ -960,7 +960,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
           newCandidates.toList(), localFolder
         )
 
-        val isEncryptedModeEnabled = accountEntity.isShowOnlyEncrypted ?: false
+        val isEncryptedModeEnabled = accountEntity.showOnlyEncrypted ?: false
         val isNew =
           !GeneralUtil.isAppForegrounded() && folderType === FoldersManager.FolderType.INBOX
 
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 744fd3d0df..f578eb5499 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
@@ -87,7 +87,7 @@ abstract class BaseIdleWorker(context: Context, params: WorkerParameters) :
     if (newMsgs.isNotEmpty()) {
       EmailUtil.fetchMsgs(remoteFolder, newMsgs)
       val msgsEncryptionStates =
-        EmailUtil.getMsgsEncryptionInfo(accountEntity.isShowOnlyEncrypted, remoteFolder, newMsgs)
+        EmailUtil.getMsgsEncryptionInfo(accountEntity.showOnlyEncrypted, remoteFolder, newMsgs)
       val msgEntities = MessageEntity.genMessageEntities(
         context = applicationContext,
         email = accountEntity.email,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleMsgsAddedWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleMsgsAddedWorker.kt
index 099b7b1941..b768a536dc 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleMsgsAddedWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/InboxIdleMsgsAddedWorker.kt
@@ -54,7 +54,7 @@ class InboxIdleMsgsAddedWorker(context: Context, params: WorkerParameters) :
           .getLastUIDOfMsgForLabelSuspend(accountEntity.email, folderFullName) ?: 0
         val cachedUIDSet =
           roomDatabase.msgDao().getUIDsForLabel(accountEntity.email, folderFullName).toSet()
-        val newMsgs = if (accountEntity.isShowOnlyEncrypted == true) {
+        val newMsgs = if (accountEntity.showOnlyEncrypted == true) {
           val foundMsgs = remoteFolder.search(EmailUtil.genEncryptedMsgsSearchTerm(accountEntity))
 
           val fetchProfile = FetchProfile().apply {
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 8d0e5d102d..797d2d0ceb 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
@@ -63,7 +63,7 @@ open class InboxIdleSyncWorker(context: Context, params: WorkerParameters) :
           roomDatabase.msgDao().getMapOfUIDAndMsgFlagsSuspend(accountEntity.email, folderFullName)
         val cachedUIDSet = mapOfUIDAndMsgFlags.keys.toSet()
 
-        if (accountEntity.isShowOnlyEncrypted == true) {
+        if (accountEntity.showOnlyEncrypted == true) {
           val foundMsgs = remoteFolder.search(EmailUtil.genEncryptedMsgsSearchTerm(accountEntity))
           val fetchProfile = FetchProfile().apply {
             add(UIDFolder.FetchProfileItem.UID)
@@ -157,7 +157,7 @@ open class InboxIdleSyncWorker(context: Context, params: WorkerParameters) :
           newCandidates, localFolder
         )
 
-        val isEncryptedModeEnabled = accountEntity.isShowOnlyEncrypted ?: false
+        val isEncryptedModeEnabled = accountEntity.showOnlyEncrypted ?: false
         val isNew = !GeneralUtil.isAppForegrounded()
 
         val msgEntities = MessageEntity.genMessageEntities(
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/LoadContactsWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/LoadContactsWorker.kt
index 2b22ee5bf4..a1e1977c9a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/LoadContactsWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/sync/LoadContactsWorker.kt
@@ -141,13 +141,13 @@ class LoadContactsWorker(context: Context, params: WorkerParameters) :
     account: AccountEntity,
     action: suspend () -> Array<Message>
   ) = withContext(Dispatchers.IO) {
-    if (account.areContactsLoaded == true) return@withContext
+    if (account.contactsLoaded == true) return@withContext
     val msgs = action.invoke()
 
     if (msgs.isNotEmpty()) {
       updateContacts(msgs)
       FlowCryptRoomDatabase.getDatabase(applicationContext).accountDao()
-        .updateAccountSuspend(account.copy(areContactsLoaded = true))
+        .updateAccountSuspend(account.copy(contactsLoaded = true))
     }
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.kt
index bc2ebe0e8c..7feb789535 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.kt
@@ -182,7 +182,7 @@ class EmailManagerActivity : BaseEmailListActivity(),
     super.onAccountInfoRefreshed(accountEntity)
     if (accountEntity != null) {
       actionsViewModel.checkAndAddActionsToQueue(accountEntity)
-      switchView?.isChecked = activeAccount?.isShowOnlyEncrypted ?: false
+      switchView?.isChecked = activeAccount?.showOnlyEncrypted ?: false
       invalidateOptionsMenu()
       navigationView?.getHeaderView(0)?.let { initUserProfileView(it) }
     } else {
@@ -204,7 +204,7 @@ class EmailManagerActivity : BaseEmailListActivity(),
 
     val item = menu.findItem(R.id.menuSwitch)
     switchView = item.actionView.findViewById(R.id.switchShowOnlyEncryptedMessages)
-    switchView?.isChecked = activeAccount?.isShowOnlyEncrypted ?: false
+    switchView?.isChecked = activeAccount?.showOnlyEncrypted ?: false
     switchView?.setOnCheckedChangeListener { buttonView, isChecked ->
       lifecycleScope.launch {
         activeAccount?.let {
@@ -213,7 +213,7 @@ class EmailManagerActivity : BaseEmailListActivity(),
           }
 
           FlowCryptRoomDatabase.getDatabase(this@EmailManagerActivity.applicationContext)
-            .accountDao().updateAccountSuspend(it.copy(isShowOnlyEncrypted = isChecked))
+            .accountDao().updateAccountSuspend(it.copy(showOnlyEncrypted = isChecked))
 
           onShowOnlyEncryptedMsgs(isChecked)
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt
index 5d5bf7de0d..7250be8c9a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt
@@ -193,7 +193,7 @@ class MainSignInFragment : BaseSingInFragment() {
   }
 
   override fun getTempAccount(): AccountEntity? {
-    return googleSignInAccount?.let { AccountEntity(it, uuid, orgRules?.flags ?: emptyList()) }
+    return googleSignInAccount?.let { AccountEntity(it, uuid, orgRules) }
   }
 
   override fun returnResultOk() {
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 6492741430..f21082ab2a 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
@@ -58,6 +58,7 @@ 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.decrementSafely
+import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.incrementSafely
 import com.flowcrypt.email.extensions.javax.mail.internet.getFormattedString
 import com.flowcrypt.email.extensions.javax.mail.internet.personalOrEmail
@@ -1199,11 +1200,8 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi
     val viewGroup = inflater.inflate(
       R.layout.message_part_pgp_message_missing_private_key, layoutMsgParts, false
     ) as ViewGroup
-    val textViewErrorMsg = viewGroup.findViewById<TextView>(R.id.textViewErrorMessage)
-    textViewErrorMsg.text = getString(R.string.decrypt_error_current_key_cannot_open_message)
-
     val buttonImportPrivateKey = viewGroup.findViewById<Button>(R.id.buttonImportPrivateKey)
-    buttonImportPrivateKey.setOnClickListener {
+    buttonImportPrivateKey?.setOnClickListener {
       startActivityForResult(
         ImportPrivateKeyActivity.getIntent(
           context = context,
@@ -1219,7 +1217,16 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi
     }
 
     val buttonSendOwnPublicKey = viewGroup.findViewById<Button>(R.id.buttonSendOwnPublicKey)
-    buttonSendOwnPublicKey.setOnClickListener { showSendersPublicKeyDialog() }
+    buttonSendOwnPublicKey?.setOnClickListener { showSendersPublicKeyDialog() }
+
+    val textViewErrorMsg = viewGroup.findViewById<TextView>(R.id.textViewErrorMessage)
+    if (account?.clientConfiguration?.usesKeyManager() == true) {
+      textViewErrorMsg?.text = getString(R.string.your_keys_cannot_open_this_message)
+      buttonImportPrivateKey?.gone()
+      buttonSendOwnPublicKey?.text = getString(R.string.inform_sender)
+    } else {
+      textViewErrorMsg?.text = getString(R.string.decrypt_error_current_key_cannot_open_message)
+    }
 
     viewGroup.addView(genShowOrigMsgLayout(pgpMsg, inflater, viewGroup))
     return viewGroup
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt
index fc43dcfcbf..2f4dd1ce9a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt
@@ -14,13 +14,12 @@ import android.os.Bundle
 import android.provider.DocumentsContract
 import android.text.TextUtils
 import android.text.format.DateFormat
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
+import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -28,7 +27,9 @@ import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.KeyEntity
+import com.flowcrypt.email.databinding.FragmentPrivateKeyDetailsBinding
 import com.flowcrypt.email.extensions.decrementSafely
 import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.incrementSafely
@@ -63,14 +64,8 @@ import java.util.*
  */
 class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
   private val args by navArgs<PrivateKeyDetailsFragmentArgs>()
+  private var binding: FragmentPrivateKeyDetailsBinding? = null
 
-  private var tVFingerprint: TextView? = null
-  private var tVDate: TextView? = null
-  private var tVUsers: TextView? = null
-  private var tVPassPhraseVerification: TextView? = null
-  private var eTKeyPassword: EditText? = null
-  private var btnForgetPassphrase: Button? = null
-  private var gCheckPassphrase: View? = null
   private val privateKeysViewModel: PrivateKeysViewModel by viewModels()
   private val checkPrivateKeysViewModel: CheckPrivateKeysViewModel by viewModels()
   private val pgpKeyDetailsViewModel: PgpKeyDetailsViewModel by viewModels {
@@ -78,11 +73,11 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
   }
 
   override val progressView: View?
-    get() = view?.findViewById(R.id.progress)
+    get() = binding?.progress?.root
   override val contentView: View?
-    get() = view?.findViewById(R.id.content)
+    get() = binding?.content
   override val statusView: View?
-    get() = view?.findViewById(R.id.status)
+    get() = binding?.status?.root
 
   override val contentResourceId: Int = R.layout.fragment_private_key_details
 
@@ -96,6 +91,13 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
     inflater.inflate(R.menu.fragment_key_details, menu)
   }
 
+  override fun onPrepareOptionsMenu(menu: Menu) {
+    super.onPrepareOptionsMenu(menu)
+    if (account?.clientConfiguration?.usesKeyManager() == true) {
+      menu.findItem(R.id.menuActionDeleteKey).isEnabled = false
+    }
+  }
+
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     return when (item.itemId) {
       R.id.menuActionDeleteKey -> {
@@ -115,10 +117,19 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
     }
   }
 
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+    binding = FragmentPrivateKeyDetailsBinding.inflate(inflater, container, false)
+    return binding?.root
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     supportActionBar?.setTitle(R.string.key_details)
-    initViews(view)
+    initViews()
     updateViews()
     setupPgpKeyDetailsViewModel()
     setupPrivateKeysViewModel()
@@ -152,6 +163,15 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
     }
   }
 
+  override fun onAccountInfoRefreshed(accountEntity: AccountEntity?) {
+    super.onAccountInfoRefreshed(accountEntity)
+    activity?.invalidateOptionsMenu()
+
+    if (account?.clientConfiguration?.usesKeyManager() == true) {
+      binding?.btnShowPrKey?.gone()
+    }
+  }
+
   private fun saveKey(data: Intent) {
     try {
       GeneralUtil.writeFileFromStringToUri(
@@ -159,7 +179,7 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
         uri = data.data!!,
         data = pgpKeyDetailsViewModel.getPgpKeyDetails()!!.publicKey
       )
-      Toast.makeText(context, getString(R.string.saved), Toast.LENGTH_SHORT).show()
+      toast(R.string.saved, Toast.LENGTH_SHORT)
     } catch (e: Exception) {
       e.printStackTrace()
       var error = if (e.message.isNullOrEmpty()) e.javaClass.simpleName else e.message
@@ -192,72 +212,21 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
     }
   }
 
-  private fun initViews(view: View) {
-    tVFingerprint = view.findViewById(R.id.textViewFingerprint)
-    tVDate = view.findViewById(R.id.textViewDate)
-    tVUsers = view.findViewById(R.id.textViewUsers)
-    tVPassPhraseVerification = view.findViewById(R.id.tVPassPhraseVerification)
-    eTKeyPassword = view.findViewById(R.id.eTKeyPassword)
-    gCheckPassphrase = view.findViewById(R.id.gCheckPassphrase)
-
-    initButtons(view)
-  }
-
-  private fun updateViews() {
-    pgpKeyDetailsViewModel.getPgpKeyDetails()?.let { value ->
-      UIUtil.setHtmlTextToTextView(
-        getString(
-          R.string.template_fingerprint,
-          GeneralUtil.doSectionsInText(" ", value.fingerprint, 4)
-        ), tVFingerprint
-      )
-
-      tVDate?.text = getString(
-        R.string.template_date,
-        DateFormat.getMediumDateFormat(context).format(Date(value.created))
-      )
-
-      tVUsers?.text = getString(
-        R.string.template_users,
-        TextUtils.join(", ", value.pgpContacts.map { it.email })
-      )
-
-      val passPhrase = pgpKeyDetailsViewModel.getPassphrase()
-      val passPhraseType = pgpKeyDetailsViewModel.getPassphraseType()
-      if (passPhrase == null || passPhrase.isEmpty) {
-        handlePassphraseNotProvided()
-        return
-      }
-
-      if (passPhraseType == KeyEntity.PassphraseType.RAM) {
-        btnForgetPassphrase?.visible()
-      }
-    }
-  }
-
-  private fun handlePassphraseNotProvided() {
-    tVPassPhraseVerification?.setTextColor(UIUtil.getColor(requireContext(), R.color.red))
-    tVPassPhraseVerification?.text = getString(R.string.pass_phrase_not_provided)
-    btnForgetPassphrase?.gone()
-    gCheckPassphrase?.visible()
-  }
-
-  private fun initButtons(view: View) {
-    btnForgetPassphrase = view.findViewById(R.id.btnForgetPassphrase)
-    btnForgetPassphrase?.setOnClickListener {
+  private fun initViews() {
+    binding?.btnForgetPassphrase?.setOnClickListener {
       pgpKeyDetailsViewModel.forgetPassphrase()
       toast(getString(R.string.passphrase_purged_from_memory))
-      eTKeyPassword?.text = null
+      binding?.eTKeyPassword?.text = null
     }
 
-    view.findViewById<View>(R.id.btnUpdatePassphrase)?.setOnClickListener {
-      UIUtil.hideSoftInput(requireContext(), eTKeyPassword)
-      val typedText = eTKeyPassword?.text?.toString()
+    binding?.btnUpdatePassphrase?.setOnClickListener {
+      UIUtil.hideSoftInput(requireContext(), binding?.eTKeyPassword)
+      val typedText = binding?.eTKeyPassword?.text?.toString()
       if (typedText.isNullOrEmpty()) {
-        showInfoSnackbar(eTKeyPassword, getString(R.string.passphrase_must_be_non_empty))
+        showInfoSnackbar(binding?.eTKeyPassword, getString(R.string.passphrase_must_be_non_empty))
       } else {
         snackBar?.dismiss()
-        eTKeyPassword?.let {
+        binding?.eTKeyPassword?.let {
           val passPhrase = Passphrase.fromPassword(typedText)
           val pgpKeyDetails = pgpKeyDetailsViewModel.getPgpKeyDetails() ?: return@let
           checkPrivateKeysViewModel.checkKeys(
@@ -270,7 +239,7 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
       }
     }
 
-    view.findViewById<View>(R.id.btnShowPubKey)?.setOnClickListener {
+    binding?.btnShowPubKey?.setOnClickListener {
       val dialogFragment = InfoDialogFragment.newInstance(
         dialogTitle = "",
         dialogMsg = pgpKeyDetailsViewModel.getPgpKeyDetails()!!.publicKey
@@ -278,25 +247,60 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
       dialogFragment.show(parentFragmentManager, InfoDialogFragment::class.java.simpleName)
     }
 
-    view.findViewById<View>(R.id.btnCopyToClipboard)?.setOnClickListener {
-      val clipboard =
-        requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-      clipboard.setPrimaryClip(
-        ClipData.newPlainText(
-          "pubKey",
-          pgpKeyDetailsViewModel.getPgpKeyDetails()?.publicKey
-        )
+    binding?.btnCopyToClipboard?.setOnClickListener {
+      val clipboard = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
+      clipboard?.setPrimaryClip(
+        ClipData.newPlainText("pubKey", pgpKeyDetailsViewModel.getPgpKeyDetails()?.publicKey)
       )
-      Toast.makeText(context, getString(R.string.copied), Toast.LENGTH_SHORT).show()
+      toast(R.string.copied, Toast.LENGTH_SHORT)
     }
-    view.findViewById<View>(R.id.btnSaveToFile)?.setOnClickListener {
+    binding?.btnSaveToFile?.setOnClickListener {
       chooseDest()
     }
-    view.findViewById<View>(R.id.btnShowPrKey)?.setOnClickListener {
+    binding?.btnShowPrKey?.setOnClickListener {
       toast(getString(R.string.see_backups_to_save_your_private_keys), Toast.LENGTH_SHORT)
     }
   }
 
+  private fun updateViews() {
+    pgpKeyDetailsViewModel.getPgpKeyDetails()?.let { value ->
+      UIUtil.setHtmlTextToTextView(
+        getString(
+          R.string.template_fingerprint,
+          GeneralUtil.doSectionsInText(" ", value.fingerprint, 4)
+        ), binding?.tVFingerprint
+      )
+
+      binding?.tVDate?.text = getString(
+        R.string.template_date,
+        DateFormat.getMediumDateFormat(context).format(Date(value.created))
+      )
+
+      binding?.tVUsers?.text = getString(
+        R.string.template_users,
+        TextUtils.join(", ", value.pgpContacts.map { it.email })
+      )
+
+      val passPhrase = pgpKeyDetailsViewModel.getPassphrase()
+      val passPhraseType = pgpKeyDetailsViewModel.getPassphraseType()
+      if (passPhrase == null || passPhrase.isEmpty) {
+        handlePassphraseNotProvided()
+        return
+      }
+
+      if (passPhraseType == KeyEntity.PassphraseType.RAM) {
+        binding?.btnForgetPassphrase?.visible()
+      }
+    }
+  }
+
+  private fun handlePassphraseNotProvided() {
+    binding?.tVPassPhraseVerification?.setTextColor(UIUtil.getColor(requireContext(), R.color.red))
+    binding?.tVPassPhraseVerification?.text = getString(R.string.pass_phrase_not_provided)
+    binding?.btnForgetPassphrase?.gone()
+    binding?.gCheckPassphrase?.visible()
+  }
+
   private fun chooseDest() {
     val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
     intent.addCategory(Intent.CATEGORY_OPENABLE)
@@ -382,11 +386,11 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
 
         Result.Status.SUCCESS -> {
           val checkResult = it.data?.firstOrNull()
-          var verificationMsg: String?
+          val verificationMsg: String?
           if (checkResult != null) {
             if (checkResult.pgpKeyDetails.isPrivate) {
               if (checkResult.e == null) {
-                tVPassPhraseVerification?.setTextColor(
+                binding?.tVPassPhraseVerification?.setTextColor(
                   UIUtil.getColor(requireContext(), R.color.colorPrimaryLight)
                 )
                 verificationMsg = getString(R.string.stored_pass_phrase_matched)
@@ -397,17 +401,17 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
                       Passphrase.fromPassword(checkResult.passphrase)
                     )
                   }
-                  btnForgetPassphrase?.visible()
-                  gCheckPassphrase?.gone()
+                  binding?.btnForgetPassphrase?.visible()
+                  binding?.gCheckPassphrase?.gone()
                 }
               } else {
                 if (pgpKeyDetailsViewModel.getPassphraseType() == KeyEntity.PassphraseType.RAM) {
-                  eTKeyPassword?.requestFocus()
+                  binding?.eTKeyPassword?.requestFocus()
                   toast(R.string.password_is_incorrect)
                   verificationMsg = getString(R.string.pass_phrase_not_provided)
                 } else {
                   verificationMsg = getString(R.string.stored_pass_phrase_mismatch)
-                  tVPassPhraseVerification?.setTextColor(
+                  binding?.tVPassPhraseVerification?.setTextColor(
                     UIUtil.getColor(requireContext(), R.color.red)
                   )
                 }
@@ -415,10 +419,12 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour {
             } else verificationMsg = getString(R.string.not_private_key)
           } else {
             verificationMsg = getString(R.string.could_not_check_pass_phrase)
-            tVPassPhraseVerification?.setTextColor(UIUtil.getColor(requireContext(), R.color.red))
+            binding?.tVPassPhraseVerification?.setTextColor(
+              UIUtil.getColor(requireContext(), R.color.red)
+            )
           }
 
-          tVPassPhraseVerification?.text = verificationMsg
+          binding?.tVPassPhraseVerification?.text = verificationMsg
           baseActivity.countingIdlingResource.decrementSafely()
         }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt
index acd792e741..4610e8febe 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt
@@ -6,12 +6,13 @@
 package com.flowcrypt.email.ui.activity.fragment
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
@@ -25,19 +26,23 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.database.entity.AccountEntity
+import com.flowcrypt.email.databinding.FragmentPrivateKeysBinding
 import com.flowcrypt.email.extensions.decrementSafely
+import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.incrementSafely
 import com.flowcrypt.email.extensions.navController
 import com.flowcrypt.email.extensions.showTwoWayDialog
+import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PrivateKeysViewModel
 import com.flowcrypt.email.security.model.PgpKeyDetails
 import com.flowcrypt.email.ui.activity.ImportPrivateKeyActivity
 import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
+import com.flowcrypt.email.ui.activity.fragment.base.ListProgressBehaviour
 import com.flowcrypt.email.ui.activity.fragment.dialog.TwoWayDialogFragment
 import com.flowcrypt.email.ui.adapter.PrivateKeysRecyclerViewAdapter
 import com.flowcrypt.email.ui.adapter.selection.NodeKeyDetailsKeyProvider
 import com.flowcrypt.email.ui.adapter.selection.PrivateKeyItemDetailsLookup
-import com.flowcrypt.email.util.UIUtil
 
 /**
  * This [Fragment] shows information about available private keys in the database.
@@ -47,18 +52,12 @@ import com.flowcrypt.email.util.UIUtil
  * Time: 10:30
  * E-mail: DenBond7@gmail.com
  */
-class PrivateKeysListFragment : BaseFragment(), View.OnClickListener,
+class PrivateKeysListFragment : BaseFragment(), ListProgressBehaviour,
   PrivateKeysRecyclerViewAdapter.OnKeySelectedListener {
+  private var binding: FragmentPrivateKeysBinding? = null
 
-  private var progressBar: View? = null
-  private var emptyView: View? = null
-  private var content: View? = null
-
+  private val recyclerViewAdapter = PrivateKeysRecyclerViewAdapter(this)
   private val privateKeysViewModel: PrivateKeysViewModel by viewModels()
-  private lateinit var recyclerViewAdapter: PrivateKeysRecyclerViewAdapter
-
-  override val contentResourceId: Int = R.layout.fragment_private_keys
-
   private var tracker: SelectionTracker<PgpKeyDetails>? = null
   private var actionMode: ActionMode? = null
   private val selectionObserver = object : SelectionTracker.SelectionObserver<PgpKeyDetails>() {
@@ -83,15 +82,29 @@ class PrivateKeysListFragment : BaseFragment(), View.OnClickListener,
     }
   }
 
-  override fun onAttach(context: Context) {
-    super.onAttach(context)
-    recyclerViewAdapter = PrivateKeysRecyclerViewAdapter(context, this)
+  override val emptyView: View?
+    get() = binding?.emptyView
+  override val progressView: View?
+    get() = binding?.progressBar
+  override val contentView: View?
+    get() = binding?.groupContent
+  override val statusView: View? = null
+
+  override val contentResourceId: Int = R.layout.fragment_private_keys
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+    binding = FragmentPrivateKeysBinding.inflate(inflater, container, false)
+    return binding?.root
   }
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     supportActionBar?.setTitle(R.string.keys)
-    initViews(view)
+    initViews()
     setupPrivateKeysViewModel()
   }
 
@@ -112,11 +125,7 @@ class PrivateKeysListFragment : BaseFragment(), View.OnClickListener,
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     when (requestCode) {
       REQUEST_CODE_START_IMPORT_KEY_ACTIVITY -> when (resultCode) {
-        Activity.RESULT_OK -> Toast.makeText(
-          context,
-          R.string.key_successfully_imported,
-          Toast.LENGTH_SHORT
-        ).show()
+        Activity.RESULT_OK -> toast(R.string.key_successfully_imported, Toast.LENGTH_SHORT)
       }
 
       REQUEST_CODE_DELETE_KEYS_DIALOG -> {
@@ -136,24 +145,6 @@ class PrivateKeysListFragment : BaseFragment(), View.OnClickListener,
     }
   }
 
-  override fun onClick(v: View) {
-    when (v.id) {
-      R.id.floatActionButtonAddKey -> startActivityForResult(
-        ImportPrivateKeyActivity.getIntent(
-          context = requireContext(),
-          title = getString(R.string.import_private_key),
-          throwErrorIfDuplicateFoundEnabled = true,
-          cls = ImportPrivateKeyActivity::class.java,
-          isSubmittingPubKeysEnabled = false,
-          accountEntity = account,
-          isSyncEnabled = true,
-          skipImportedKeys = true
-        ),
-        REQUEST_CODE_START_IMPORT_KEY_ACTIVITY
-      )
-    }
-  }
-
   override fun onKeySelected(position: Int, pgpKeyDetails: PgpKeyDetails?) {
     if (tracker?.hasSelection() == true) {
       return
@@ -167,59 +158,75 @@ class PrivateKeysListFragment : BaseFragment(), View.OnClickListener,
     }
   }
 
+  override fun onAccountInfoRefreshed(accountEntity: AccountEntity?) {
+    super.onAccountInfoRefreshed(accountEntity)
+    if (accountEntity?.clientConfiguration?.usesKeyManager() == true) {
+      binding?.floatActionButtonAddKey?.gone()
+      recyclerViewAdapter.tracker = null
+    }
+  }
+
   private fun setupPrivateKeysViewModel() {
     privateKeysViewModel.parseKeysResultLiveData.observe(viewLifecycleOwner, {
       when (it.status) {
         Result.Status.LOADING -> {
+          showProgress()
           baseActivity.countingIdlingResource.incrementSafely()
-          emptyView?.visibility = View.GONE
-          UIUtil.exchangeViewVisibility(true, progressBar, content)
         }
 
         Result.Status.SUCCESS -> {
           val detailsList = it.data ?: emptyList()
+          recyclerViewAdapter.swap(detailsList)
           if (detailsList.isEmpty()) {
-            recyclerViewAdapter.swap(emptyList())
-            UIUtil.exchangeViewVisibility(true, emptyView, content)
+            showEmptyView()
           } else {
-            recyclerViewAdapter.swap(detailsList)
-            UIUtil.exchangeViewVisibility(false, progressBar, content)
+            showContent()
           }
           baseActivity.countingIdlingResource.decrementSafely()
         }
 
         Result.Status.EXCEPTION -> {
-          Toast.makeText(context, it.exception?.message, Toast.LENGTH_SHORT).show()
+          showContent()
+          toast(it.exception?.message, Toast.LENGTH_SHORT)
           baseActivity.countingIdlingResource.decrementSafely()
         }
       }
     })
   }
 
-  private fun initViews(root: View) {
-    this.progressBar = root.findViewById(R.id.progressBar)
-    this.content = root.findViewById(R.id.groupContent)
-    this.emptyView = root.findViewById(R.id.emptyView)
-
-    val recyclerView = root.findViewById<RecyclerView>(R.id.recyclerViewKeys)
-    recyclerView.setHasFixedSize(true)
-    val manager = LinearLayoutManager(context)
-    val decoration = DividerItemDecoration(recyclerView.context, manager.orientation)
-    val drawable =
-      ResourcesCompat.getDrawable(resources, R.drawable.divider_1dp_grey, requireContext().theme)
-    drawable?.let { decoration.setDrawable(drawable) }
-    recyclerView.addItemDecoration(decoration)
-    recyclerView.layoutManager = manager
-    recyclerView.adapter = recyclerViewAdapter
+  private fun initViews() {
+    binding?.recyclerViewKeys?.apply {
+      setHasFixedSize(true)
+      val manager = LinearLayoutManager(context)
+      val decoration = DividerItemDecoration(context, manager.orientation)
+      val drawable =
+        ResourcesCompat.getDrawable(resources, R.drawable.divider_1dp_grey, requireContext().theme)
+      drawable?.let { decoration.setDrawable(drawable) }
+      addItemDecoration(decoration)
+      layoutManager = manager
+      adapter = recyclerViewAdapter
+    }
 
     //setupSelectionTracker(recyclerView)
 
     if (recyclerViewAdapter.itemCount > 0) {
-      progressBar?.visibility = View.GONE
+      showContent()
     }
 
-    if (root.findViewById<View>(R.id.floatActionButtonAddKey) != null) {
-      root.findViewById<View>(R.id.floatActionButtonAddKey).setOnClickListener(this)
+    binding?.floatActionButtonAddKey?.setOnClickListener {
+      startActivityForResult(
+        ImportPrivateKeyActivity.getIntent(
+          context = requireContext(),
+          title = getString(R.string.import_private_key),
+          throwErrorIfDuplicateFoundEnabled = true,
+          cls = ImportPrivateKeyActivity::class.java,
+          isSubmittingPubKeysEnabled = false,
+          accountEntity = account,
+          isSyncEnabled = true,
+          skipImportedKeys = true
+        ),
+        REQUEST_CODE_START_IMPORT_KEY_ACTIVITY
+      )
     }
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt
index bfddea42ac..b092b8f1b2 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt
@@ -73,7 +73,7 @@ open class NotificationsSettingsFragment : BasePreferenceFragment(),
 
   override fun onAccountInfoRefreshed(accountEntity: AccountEntity?) {
     if (accountEntity != null) {
-      val isEncryptedModeEnabled = accountEntity.isShowOnlyEncrypted
+      val isEncryptedModeEnabled = accountEntity.showOnlyEncrypted
 
       if (isEncryptedModeEnabled == true) {
         levels = arrayOf(
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/PrivateKeysRecyclerViewAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/PrivateKeysRecyclerViewAdapter.kt
index 5ad00dff69..4aaf4600a1 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/PrivateKeysRecyclerViewAdapter.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/PrivateKeysRecyclerViewAdapter.kt
@@ -5,7 +5,6 @@
 
 package com.flowcrypt.email.ui.adapter
 
-import android.content.Context
 import android.text.format.DateFormat
 import android.view.LayoutInflater
 import android.view.View
@@ -30,11 +29,10 @@ import java.util.Date
  * E-mail: DenBond7@gmail.com
  */
 class PrivateKeysRecyclerViewAdapter(
-  context: Context,
   private val listener: OnKeySelectedListener?,
   val pgpKeyDetailsList: MutableList<PgpKeyDetails> = mutableListOf()
 ) : RecyclerView.Adapter<PrivateKeysRecyclerViewAdapter.ViewHolder>() {
-  private val dateFormat: java.text.DateFormat = DateFormat.getMediumDateFormat(context)
+  private var dateFormat: java.text.DateFormat? = null
   var tracker: SelectionTracker<PgpKeyDetails>? = null
 
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -43,6 +41,10 @@ class PrivateKeysRecyclerViewAdapter(
   }
 
   override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+    if (dateFormat == null) {
+      dateFormat = DateFormat.getMediumDateFormat(viewHolder.itemView.context)
+    }
+
     val nodeKeyDetails = pgpKeyDetailsList[position]
     tracker?.isSelected(nodeKeyDetails)?.let { viewHolder.setActivated(it) }
     val email = nodeKeyDetails.primaryPgpContact.email
@@ -54,7 +56,7 @@ class PrivateKeysRecyclerViewAdapter(
 
     val timestamp = nodeKeyDetails.created
     if (timestamp != -1L) {
-      viewHolder.textViewCreationDate.text = dateFormat.format(Date(timestamp))
+      viewHolder.textViewCreationDate.text = dateFormat?.format(Date(timestamp))
     } else {
       viewHolder.textViewCreationDate.text = null
     }
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 9ebb475b28..a0e41c085a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt
@@ -87,11 +87,11 @@ class GeneralUtil {
 
     suspend fun hasInternetAccess(): Boolean = withContext(Dispatchers.IO) {
       val url = "https://www.google.com"
-      val connectionTimeoutInSeconds = 2000L
+      val connectionTimeoutInMilliseconds = 2000L
       val okHttpClient = OkHttpClient.Builder()
-        .connectTimeout(connectionTimeoutInSeconds, TimeUnit.MILLISECONDS)
-        .writeTimeout(connectionTimeoutInSeconds, TimeUnit.MILLISECONDS)
-        .readTimeout(connectionTimeoutInSeconds, TimeUnit.MILLISECONDS)
+        .connectTimeout(connectionTimeoutInMilliseconds, TimeUnit.MILLISECONDS)
+        .writeTimeout(connectionTimeoutInMilliseconds, TimeUnit.MILLISECONDS)
+        .readTimeout(connectionTimeoutInMilliseconds, TimeUnit.MILLISECONDS)
         .build()
 
       val retrofit = Retrofit.Builder()
diff --git a/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml b/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml
index 98cbc59724..6120388043 100644
--- a/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_private_key_details.xml
@@ -27,7 +27,7 @@
             android:animateLayoutChanges="true">
 
             <TextView
-                android:id="@+id/textViewHeader"
+                android:id="@+id/tVHeader"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/default_margin_content_small"
@@ -48,7 +48,7 @@
                 android:theme="@style/AppWidget.Button.Green"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-                app:layout_constraintTop_toBottomOf="@+id/textViewHeader" />
+                app:layout_constraintTop_toBottomOf="@+id/tVHeader" />
 
             <Button
                 android:id="@+id/btnCopyToClipboard"
@@ -75,7 +75,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/btnCopyToClipboard" />
 
             <TextView
-                android:id="@+id/textViewFingerprint"
+                android:id="@+id/tVFingerprint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:textIsSelectable="true"
@@ -85,25 +85,25 @@
                 tools:text="Fingerprint: XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX" />
 
             <TextView
-                android:id="@+id/textViewDate"
+                android:id="@+id/tVDate"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/default_margin_content_small"
                 android:textIsSelectable="true"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-                app:layout_constraintTop_toBottomOf="@+id/textViewFingerprint"
+                app:layout_constraintTop_toBottomOf="@+id/tVFingerprint"
                 tools:text="Date: Nov 3, 2017" />
 
             <TextView
-                android:id="@+id/textViewUsers"
+                android:id="@+id/tVUsers"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/default_margin_content_small"
                 android:textIsSelectable="true"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-                app:layout_constraintTop_toBottomOf="@+id/textViewDate"
+                app:layout_constraintTop_toBottomOf="@+id/tVDate"
                 tools:text="Users: email@domain.com, email2@domain.com" />
 
             <TextView
@@ -116,7 +116,7 @@
                 android:textIsSelectable="true"
                 app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
                 app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-                app:layout_constraintTop_toBottomOf="@+id/textViewUsers" />
+                app:layout_constraintTop_toBottomOf="@+id/tVUsers" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/tILKeyPassword"
diff --git a/FlowCrypt/src/main/res/layout/fragment_private_keys.xml b/FlowCrypt/src/main/res/layout/fragment_private_keys.xml
index ae520509ee..1b560d0fe1 100644
--- a/FlowCrypt/src/main/res/layout/fragment_private_keys.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_private_keys.xml
@@ -8,7 +8,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linearLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true">
 
     <ProgressBar
         android:id="@+id/progressBar"
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index 5a66c3cc4b..8b265c43b5 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -177,6 +177,7 @@
     <string name="decrypt_error_could_not_open_message">Could not open this message with %1$s.</string>
     <string name="decrypt_error_message_badly_formatted">Message is either badly formatted or not compatible with %1$s.</string>
     <string name="decrypt_error_please_write_me">Please write us at %1$s so that we can fix it for you.</string>
+    <string name="your_keys_cannot_open_this_message">Your keys cannot open this message</string>
     <string name="decrypt_error_current_key_cannot_open_message">Your current key cannot open this message. If you
         have any other keys available, you should import them now.</string>
     <string name="email_does_not_available_in_this_folder">Message not found, it may have been moved to another folder.</string>
@@ -527,4 +528,5 @@
     <string name="found_not_fully_encrypted_key">Error. Key %1$s is not fully encrypted</string>
     <string name="could_not_parse_one_of_ekm_key">Couldn\'t parse one of the keys received from EKM</string>
     <string name="no_connection_or_server_is_not_reachable">No connection or the server is not reachable</string>
+    <string name="inform_sender">Inform the sender</string>
 </resources>