diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b8ebed962e..41125a7ec8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,24 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="99" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="99" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <indentOptions>
@@ -140,6 +125,7 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130cd9..fb7f4a8a46 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d8b..e497da9998 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <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" />
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
index 12d19c0e31..f8c54f2fb3 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
@@ -42,7 +42,7 @@ import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.email.model.IncomingMessageInfo
 import com.flowcrypt.email.base.BaseTest
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
-import com.flowcrypt.email.extensions.pgp.expiration
+import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.expiration
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withAppBarLayoutBackgroundColor
 import com.flowcrypt.email.matchers.CustomMatchers.Companion.withChipsBackgroundColor
 import com.flowcrypt.email.model.KeyDetails
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/node/MsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/node/MsgBlock.kt
index 3d1d3b03e9..db7c5900a6 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/node/MsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/node/MsgBlock.kt
@@ -90,7 +90,7 @@ interface MsgBlock : Parcelable {
       val replaceableBlockTypes = setOf(
           PUBLIC_KEY, PRIVATE_KEY, SIGNED_MSG, ENCRYPTED_MSG, ENCRYPTED_MSG_LINK
       )
-      val fourBlockTypes = setOf(
+      val wellKnownBlockTypes = setOf(
           PUBLIC_KEY, PRIVATE_KEY, SIGNED_MSG, ENCRYPTED_MSG
       )
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/core/msg/MsgBlockParser.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/core/msg/MsgBlockParser.kt
index ba27cf13ad..4665e95df0 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/core/msg/MsgBlockParser.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/core/msg/MsgBlockParser.kt
@@ -8,7 +8,7 @@ package com.flowcrypt.email.core.msg
 import com.flowcrypt.email.api.retrofit.response.model.node.MsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.node.MsgBlockFactory
 import com.flowcrypt.email.security.pgp.PgpArmor
-import com.flowcrypt.email.extensions.lang.normalize
+import com.flowcrypt.email.extensions.kotlin.normalize
 
 @Suppress("unused")
 object MsgBlockParser {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
index f04f80e85f..0b7dbc1e95 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
@@ -24,7 +24,7 @@ import com.flowcrypt.email.api.email.gmail.api.GmaiAPIMimeMessage
 import com.flowcrypt.email.api.email.model.MessageFlag
 import com.flowcrypt.email.api.email.model.OutgoingMessageInfo
 import com.flowcrypt.email.database.MessageState
-import com.flowcrypt.email.extensions.lang.toHex
+import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.extensions.uid
 import com.flowcrypt.email.ui.activity.fragment.preferences.NotificationsSettingsFragment
 import com.flowcrypt.email.util.SharedPreferencesHelper
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/ByteExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/ByteExt.kt
new file mode 100644
index 0000000000..d279deed19
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/ByteExt.kt
@@ -0,0 +1,21 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: ivan
+ */
+
+package com.flowcrypt.email.extensions.kotlin
+
+object ByteExtHelper {
+  const val tab = '\t'.toByte()
+  const val space = ' '.toByte()
+  const val cr = '\r'.toByte()
+  const val lf = '\n'.toByte()
+}
+
+val Byte.isLineEnding: Boolean get() {
+  return this == ByteExtHelper.cr || this == ByteExtHelper.lf
+}
+
+val Byte.isWhiteSpace: Boolean get() {
+  return isLineEnding || this == ByteExtHelper.tab || this == ByteExtHelper.space
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/LongExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/LongExt.kt
similarity index 89%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/LongExt.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/LongExt.kt
index 56fe82b743..49bacdc411 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/LongExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/LongExt.kt
@@ -5,7 +5,7 @@
  *   Ivan Pizhenko
  */
 
-package com.flowcrypt.email.extensions.lang
+package com.flowcrypt.email.extensions.kotlin
 
 import java.util.Locale
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/StringExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
similarity index 95%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/StringExt.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
index 8c18976b40..ee028ecea7 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/StringExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
@@ -3,7 +3,7 @@
  * Contributors: Ivan Pizhenko
  */
 
-package com.flowcrypt.email.extensions.lang
+package com.flowcrypt.email.extensions.kotlin
 
 object StringExtensionsHelper {
   @JvmStatic
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/ByteArrayExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/ByteArrayExt.kt
deleted file mode 100644
index 8d9063834c..0000000000
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/lang/ByteArrayExt.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: Ivan Pizhenko
- */
-
-package com.flowcrypt.email.extensions.lang
-
-fun ByteArray.toLowerHexString(): String {
-  val result = StringBuilder()
-  for (b in this) {
-    result.append("%02x".format(b))
-  }
-  return result.toString()
-}
-
-fun ByteArray.toUpperHexString(): String {
-  val result = StringBuilder()
-  for (b in this) {
-    result.append("%02X".format(b))
-  }
-  return result.toString()
-}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/pgp/PGPKeyRingExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/org/bouncycastle/openpgp/PGPKeyRingExt.kt
similarity index 97%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/extensions/pgp/PGPKeyRingExt.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/extensions/org/bouncycastle/openpgp/PGPKeyRingExt.kt
index f806b1c372..eb1ccb5fa8 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/pgp/PGPKeyRingExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/org/bouncycastle/openpgp/PGPKeyRingExt.kt
@@ -1,11 +1,9 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors:
- *   DenBond7
- *   Ivan Pizhenko
+ * Contributors: ivan
  */
 
-package com.flowcrypt.email.extensions.pgp
+package com.flowcrypt.email.extensions.org.bouncycastle.openpgp
 
 import com.flowcrypt.email.api.retrofit.response.model.node.Algo
 import com.flowcrypt.email.api.retrofit.response.model.node.KeyId
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/pgp/PGPSecretKeyRingExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/org/bouncycastle/openpgp/PGPSecretKeyRingExt.kt
similarity index 79%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/extensions/pgp/PGPSecretKeyRingExt.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/extensions/org/bouncycastle/openpgp/PGPSecretKeyRingExt.kt
index d42a4b160f..7be1753443 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/pgp/PGPSecretKeyRingExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/org/bouncycastle/openpgp/PGPSecretKeyRingExt.kt
@@ -1,9 +1,9 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: Ivan Pizhenko
+ * Contributors: ivan
  */
 
-package com.flowcrypt.email.extensions.pgp
+package com.flowcrypt.email.extensions.org.bouncycastle.openpgp
 
 import org.bouncycastle.openpgp.PGPPublicKeyRing
 import org.bouncycastle.openpgp.PGPSecretKeyRing
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt
index 11516f54de..a5a84acb41 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/CheckPrivateKeysViewModel.kt
@@ -18,6 +18,7 @@ import com.flowcrypt.email.util.exception.WrongPassPhraseException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.pgpainless.util.Passphrase
 
 /**
  * @author Denis Bondarenko
@@ -56,7 +57,7 @@ class CheckPrivateKeysViewModel(application: Application) : BaseAndroidViewModel
                 copy.passphrase = passphrase
               } else {
                 try {
-                  PgpKey.decryptKey(prvKey, passphrase)
+                  PgpKey.decryptKey(prvKey, Passphrase.fromPassword(passphrase))
                   copy.passphrase = passphrase
                 } catch (ex: Exception) {
                   //to prevent leak sensitive info we skip printing stack trace for release builds
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 7330bae2c1..22c007b364 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
@@ -31,7 +31,7 @@ import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.AttachmentEntity
 import com.flowcrypt.email.database.entity.LabelEntity
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.lang.toHex
+import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.jetpack.workmanager.sync.CheckIsLoadedMessagesEncryptedWorker
 import com.flowcrypt.email.model.EmailAndNamePair
 import com.flowcrypt.email.service.EmailAndNameUpdaterService
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt
index fde4073318..c305c850f2 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PrivateKeysViewModel.kt
@@ -30,7 +30,7 @@ import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.api.retrofit.response.model.node.NodeKeyDetails
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.ActionQueueEntity
-import com.flowcrypt.email.extensions.pgp.toNodeKeyDetails
+import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.toNodeKeyDetails
 import com.flowcrypt.email.model.KeyDetails
 import com.flowcrypt.email.model.KeyImportModel
 import com.flowcrypt.email.model.PgpContact
@@ -53,6 +53,7 @@ import kotlinx.coroutines.withContext
 import org.pgpainless.PGPainless
 import org.pgpainless.key.collection.PGPKeyRingCollection
 import org.pgpainless.key.util.UserId
+import org.pgpainless.util.Passphrase
 import java.util.*
 
 /**
@@ -399,7 +400,9 @@ class PrivateKeysViewModel(application: Application) : BaseNodeApiViewModel(appl
         val encryptedKey: String
         try {
           encryptedKey = PgpKey.changeKeyPassphrase(
-              nodeKeyDetails.privateKey!!, oldPassphrase!!, newPassphrase
+              nodeKeyDetails.privateKey!!,
+              Passphrase.fromPassword(oldPassphrase!!),
+              Passphrase.fromPassword(newPassphrase)
           )
         } catch (e: Exception) {
           throw IllegalStateException(
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/ForwardedAttachmentsDownloaderWorker.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/ForwardedAttachmentsDownloaderWorker.kt
index 80d30ca64f..c6556641b0 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/ForwardedAttachmentsDownloaderWorker.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/workmanager/ForwardedAttachmentsDownloaderWorker.kt
@@ -25,7 +25,7 @@ import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.AttachmentEntity
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.lang.toHex
+import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.jetpack.viewmodel.AccountViewModel
 import com.flowcrypt.email.security.SecurityUtils
 import com.flowcrypt.email.security.pgp.PgpEncrypt
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 d5db3d567a..6b6ae42a3f 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
@@ -11,7 +11,7 @@ import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.lang.toHex
+import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.service.MessagesNotificationManager
 import com.flowcrypt.email.util.GeneralUtil
 import com.sun.mail.imap.IMAPFolder
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt
index 6e3c0d207c..cefc210d73 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/SecurityUtils.kt
@@ -21,6 +21,7 @@ import com.flowcrypt.email.util.exception.PrivateKeyStrengthException
 import com.google.android.gms.common.util.CollectionUtils
 import org.apache.commons.codec.android.binary.Hex
 import org.apache.commons.codec.android.digest.DigestUtils
+import org.pgpainless.util.Passphrase
 import java.util.*
 
 /**
@@ -84,7 +85,7 @@ class SecurityUtils {
         val keyDetails = nodeKeyDetailsList.first()
 
         val encryptedKey = if (keyDetails.isFullyDecrypted == true) {
-          PgpKey.encryptKey(private, passPhrase)
+          PgpKey.encryptKey(private, Passphrase.fromPassword(passPhrase))
         } else {
           keyDetails.privateKey
         }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpArmor.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpArmor.kt
index 2fa529cc86..4b69f64e17 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpArmor.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpArmor.kt
@@ -7,21 +7,28 @@ package com.flowcrypt.email.security.pgp
 
 import com.flowcrypt.email.BuildConfig
 import com.flowcrypt.email.api.retrofit.response.model.node.MsgBlock
-import com.flowcrypt.email.extensions.lang.countOfMatchesZeroOneOrMore
-import com.flowcrypt.email.extensions.lang.normalize
-import java.lang.IllegalArgumentException
+import com.flowcrypt.email.extensions.kotlin.countOfMatchesZeroOneOrMore
+import com.flowcrypt.email.extensions.kotlin.isWhiteSpace
+import com.flowcrypt.email.extensions.kotlin.normalize
+import org.bouncycastle.bcpg.ArmoredInputStream
 import org.bouncycastle.bcpg.ArmoredOutputStream
+import org.bouncycastle.openpgp.PGPException
+import org.bouncycastle.util.Strings
+import java.lang.IllegalArgumentException
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.io.InputStream
 
 @Suppress("unused")
 object PgpArmor {
-  data class CryptoArmorStringHeaderDefinition (
+  data class CryptoArmorStringHeaderDefinition(
       val begin: String,
       val middle: String? = null,
       val end: String,
       val replace: Boolean
   )
 
-  data class CryptoArmorRegexHeaderDefinition (
+  data class CryptoArmorRegexHeaderDefinition(
       val beginRegexp: Regex,
       val middleRegexp: Regex? = null,
       val endRegexp: Regex,
@@ -107,7 +114,7 @@ object PgpArmor {
       if (nl3 > 1 && nl6 == 1) {
         // newlines tripled: fix
         result = result.replace("\n\n\n", "\n")
-      } else if (nl2 > 1 && nl4== 1) {
+      } else if (nl2 > 1 && nl4 == 1) {
         // newlines doubled. GPA on windows does this, and sometimes message
         // can get extracted this way from HTML
         result = result.replace("\n\n", "\n")
@@ -117,7 +124,7 @@ object PgpArmor {
     // check for and fix missing a mandatory empty line
     val lines = result.split('\n')
     val h = ARMOR_HEADER_DICT[blockType]!!
-    if (lines.size > 5 && lines[0].indexOf(h.begin)  > -1
+    if (lines.size > 5 && lines[0].indexOf(h.begin) > -1
         && lines[lines.size - 1].indexOf(h.end) > -1 && lines.indexOf("") == -1) {
       for (i in 1..5) {
         // skip comment lines, looking for the first data line
@@ -147,4 +154,109 @@ object PgpArmor {
 
   @JvmStatic
   private val normalizeRegex2 = Regex("^[a-zA-Z0-9/+]{32,77}\$")
+
+  @Suppress("ArrayInDataClass")
+  data class CleartextSignedMessage(
+      val content: ByteArrayOutputStream,
+      val signature: Any?
+  )
+
+  // Based on this example:
+  // https://github.com/bcgit/bc-java/blob/bc3b92f1f0e78b82e2584c5fb4b226a13e7f8b3b/pg/src/main/java/org/bouncycastle/openpgp/examples/ClearSignedFileProcessor.java
+  @JvmStatic
+  fun readSignedClearTextMessage(input: InputStream): CleartextSignedMessage {
+    try {
+      ArmoredInputStream(input).use { armoredInput ->
+        val out = ByteArrayOutputStream()
+        out.use {
+          val lineOut = ByteArrayOutputStream()
+          var lookAhead = readInputLine(lineOut, armoredInput)
+          if (lookAhead != -1 && armoredInput.isClearText) {
+            var line = lineOut.toByteArray()
+            out.write(line, 0, getLengthWithoutSeparatorOrTrailingWhitespace(line))
+            out.write(lineSeparatorBytes)
+            while (lookAhead != -1 && armoredInput.isClearText) {
+              lookAhead = readInputLine(lineOut, lookAhead, armoredInput)
+              line = lineOut.toByteArray()
+              out.write(line, 0, getLengthWithoutSeparatorOrTrailingWhitespace(line))
+              out.write(lineSeparatorBytes)
+            }
+          } else {
+            // a single line file
+            if (lookAhead != -1) {
+              val line = lineOut.toByteArray()
+              out.write(line, 0, getLengthWithoutSeparatorOrTrailingWhitespace(line))
+              out.write(lineSeparatorBytes)
+            }
+          }
+        }
+        return CleartextSignedMessage(out, null)
+      }
+    } catch (ex: PGPException) {
+      throw PGPException("Cleartext format error", ex)
+    } catch (ex: IOException) {
+      throw PGPException("Cleartext format error", ex)
+    }
+  }
+
+  @Throws(IOException::class)
+  @JvmStatic
+  private fun readInputLine(output: ByteArrayOutputStream, input: InputStream): Int {
+    output.reset()
+    var lookAhead = -1
+    var ch: Int
+    while (input.read().also { ch = it } >= 0) {
+      output.write(ch)
+      if (ch == '\r'.toInt() || ch == '\n'.toInt()) {
+        lookAhead = readPassedEOL(output, ch, input)
+        break
+      }
+    }
+    return lookAhead
+  }
+
+  @Throws(IOException::class)
+  @JvmStatic
+  private fun readInputLine(
+      output: ByteArrayOutputStream,
+      initialLookAhead: Int,
+      input: InputStream
+  ): Int {
+    var lookAhead = initialLookAhead
+    output.reset()
+    var ch = lookAhead
+    do {
+      output.write(ch)
+      if (ch == '\r'.toInt() || ch == '\n'.toInt()) {
+        lookAhead = readPassedEOL(output, ch, input)
+        break
+      }
+    } while (input.read().also { ch = it } >= 0)
+    if (ch < 0) {
+      lookAhead = -1
+    }
+    return lookAhead
+  }
+
+  @Throws(IOException::class)
+  @JvmStatic
+  private fun readPassedEOL(output: ByteArrayOutputStream, lastCh: Int, input: InputStream): Int {
+    var lookAhead: Int = input.read()
+    if (lastCh == '\r'.toInt() && lookAhead == '\n'.toInt()) {
+      output.write(lookAhead)
+      lookAhead = input.read()
+    }
+    return lookAhead
+  }
+
+  @JvmStatic
+  private fun getLengthWithoutSeparatorOrTrailingWhitespace(line: ByteArray): Int {
+    var end = line.size - 1
+    while (end >= 0 && line[end].isWhiteSpace) {
+      end--
+    }
+    return end + 1
+  }
+
+  private val lineSeparatorBytes = Strings.lineSeparator().toByteArray()
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpKey.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpKey.kt
index a787107299..6a58fbaacc 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpKey.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpKey.kt
@@ -5,8 +5,8 @@
 
 package com.flowcrypt.email.security.pgp
 
-import com.flowcrypt.email.extensions.pgp.armor
-import com.flowcrypt.email.extensions.pgp.toNodeKeyDetails
+import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.armor
+import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.toNodeKeyDetails
 import org.bouncycastle.openpgp.PGPKeyRing
 import org.bouncycastle.openpgp.PGPSecretKeyRing
 import org.pgpainless.PGPainless
@@ -21,7 +21,7 @@ object PgpKey {
    *
    * @param armored Should be a single private key.
    */
-  fun encryptKey(armored: String, passphrase: String): String {
+  fun encryptKey(armored: String, passphrase: Passphrase): String {
     return encryptKey(extractSecretKeyRing(armored), passphrase).armor()
   }
 
@@ -30,7 +30,7 @@ object PgpKey {
    *
    * @param armored Should be a single private key.
    */
-  fun decryptKey(armored: String, passphrase: String): String {
+  fun decryptKey(armored: String, passphrase: Passphrase): String {
     return decryptKey(extractSecretKeyRing(armored), passphrase).armor()
   }
 
@@ -39,7 +39,7 @@ object PgpKey {
    *
    * @param armored Should be a single private key.
    */
-  fun changeKeyPassphrase(armored: String, oldPassphrase: String, newPassphrase: String): String {
+  fun changeKeyPassphrase(armored: String, oldPassphrase: Passphrase, newPassphrase: Passphrase): String {
     return changeKeyPassphrase(extractSecretKeyRing(armored), oldPassphrase, newPassphrase).armor()
   }
 
@@ -62,26 +62,26 @@ object PgpKey {
     return ParseKeyResult(PGPainless.readKeyRing().keyRingCollection(source, throwExceptionIfUnknownSource))
   }
 
-  private fun decryptKey(key: PGPSecretKeyRing, passphrase: String): PGPSecretKeyRing {
+  fun decryptKey(key: PGPSecretKeyRing, passphrase: Passphrase): PGPSecretKeyRing {
     return PGPainless.modifyKeyRing(key)
-        .changePassphraseFromOldPassphrase(Passphrase.fromPassword(passphrase))
+        .changePassphraseFromOldPassphrase(passphrase)
         .withSecureDefaultSettings()
         .toNoPassphrase()
         .done()
   }
 
-  private fun encryptKey(key: PGPSecretKeyRing, passphrase: String): PGPSecretKeyRing {
+  fun encryptKey(key: PGPSecretKeyRing, passphrase: Passphrase): PGPSecretKeyRing {
     return PGPainless.modifyKeyRing(key)
         .changePassphraseFromOldPassphrase(null)
         .withSecureDefaultSettings()
-        .toNewPassphrase(Passphrase.fromPassword(passphrase))
+        .toNewPassphrase(passphrase)
         .done()
   }
 
-  private fun changeKeyPassphrase(
+  fun changeKeyPassphrase(
       key: PGPSecretKeyRing,
-      oldPassphrase: String,
-      newPassphrase: String
+      oldPassphrase: Passphrase,
+      newPassphrase: Passphrase
   ): PGPSecretKeyRing {
     return encryptKey(decryptKey(key, oldPassphrase), newPassphrase)
   }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt
index 1d73519160..5ede1867a0 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt
@@ -7,7 +7,22 @@ package com.flowcrypt.email.security.pgp
 
 import com.flowcrypt.email.api.retrofit.response.model.node.MsgBlock
 import com.flowcrypt.email.core.msg.MsgBlockParser
+import com.flowcrypt.email.security.pgp.PgpArmor.ARMOR_HEADER_DICT
+import org.bouncycastle.bcpg.ArmoredInputStream
 import org.bouncycastle.bcpg.PacketTags
+import org.bouncycastle.openpgp.PGPDataValidationException
+import org.bouncycastle.openpgp.PGPException
+import org.bouncycastle.openpgp.PGPPublicKeyRingCollection
+import org.bouncycastle.openpgp.PGPSecretKeyRing
+import org.bouncycastle.openpgp.PGPSecretKeyRingCollection
+import org.pgpainless.PGPainless
+import org.pgpainless.exception.MessageNotIntegrityProtectedException
+import org.pgpainless.exception.ModificationDetectionException
+import org.pgpainless.key.info.KeyRingInfo
+import org.pgpainless.key.protection.UnprotectedKeysProtector
+import org.pgpainless.util.Passphrase
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
 import java.nio.charset.StandardCharsets
 import kotlin.experimental.and
 import kotlin.math.min
@@ -32,37 +47,222 @@ object PgpMsg {
           // This does not 100% mean it's OpenPGP message
           // But it's a good indication that it may be
           return Pair(
-              false,
-              if (messageTypes.contains(tagNumber)) {
-                MsgBlock.Type.ENCRYPTED_MSG
-              } else {
-                MsgBlock.Type.PUBLIC_KEY
-              }
+            false,
+            if (messageTypes.contains(tagNumber)) {
+              MsgBlock.Type.ENCRYPTED_MSG
+            } else {
+              MsgBlock.Type.PUBLIC_KEY
+            }
           )
         }
       }
 
       val blocks = MsgBlockParser.detectBlocks(
-          // only interested in the first 50 bytes
-          // use ASCII, it never fails
-          String(source.copyOfRange(0, min(50, source.size)), StandardCharsets.US_ASCII).trim()
+        // only interested in the first 50 bytes
+        // use ASCII, it never fails
+        String(source.copyOfRange(0, min(50, source.size)), StandardCharsets.US_ASCII).trim()
       )
       if (blocks.size == 1 && !blocks[0].complete
-          && MsgBlock.Type.fourBlockTypes.contains(blocks[0].type)) {
+        && MsgBlock.Type.wellKnownBlockTypes.contains(blocks[0].type)
+      ) {
         return Pair(true, blocks[0].type)
       }
-
       return Pair(false, MsgBlock.Type.UNKNOWN)
-    } else return Pair(false, null)
+    }
+    return Pair(false, null)
   }
 
   private val messageTypes = intArrayOf(
-      PacketTags.SYM_ENC_INTEGRITY_PRO,
-      PacketTags.MOD_DETECTION_CODE,
-      20, // SymEncryptedAEADProtected - no BouncyCastle constant for this one
-      PacketTags.SYMMETRIC_KEY_ENC,
-      PacketTags.COMPRESSED_DATA
+    PacketTags.SYM_ENC_INTEGRITY_PRO,
+    PacketTags.MOD_DETECTION_CODE,
+    20, // SymEncryptedAEADProtected - no BouncyCastle constant for this one
+    PacketTags.SYMMETRIC_KEY_ENC,
+    PacketTags.COMPRESSED_DATA
   )
 
   private val maxTagNumber = 20
+
+  enum class DecryptionErrorType {
+    KEY_MISMATCH,
+    WRONG_PASSPHRASE,
+    NO_MDC,
+    BAD_MDC,
+    NEED_PASSPHRASE,
+    FORMAT,
+    OTHER
+  }
+
+  data class DecryptionError(
+    val type: DecryptionErrorType,
+    val message: String,
+    val cause: Throwable? = null
+  )
+
+  data class DecryptionResult(
+    // provided if decryption was successful
+    val content: ByteArrayOutputStream? = null,
+
+    // true if message was encrypted.
+    // Alternatively false (because it could have also been plaintext signed,
+    // or wrapped in PGP armor as plaintext packet without encrypting)
+    // also false when error happens.
+    val isEncrypted: Boolean = false,
+
+    // pgp messages may include original filename in them
+    val filename: String? = null,
+
+    // todo later - signature verification not supported on Android yet
+    val signature: Any? = null,
+
+    // provided if error happens
+    val error: DecryptionError? = null
+  ) {
+    companion object {
+      fun withError(
+        type: DecryptionErrorType,
+        message: String,
+        cause: Throwable? = null
+      ): DecryptionResult {
+        return DecryptionResult(error = DecryptionError(type, message, cause))
+      }
+
+      fun withCleartext(cleartext: ByteArrayOutputStream, signature: Any?): DecryptionResult {
+        return DecryptionResult(content = cleartext, signature = signature)
+      }
+
+      fun withDecrypted(content: ByteArrayOutputStream, filename: String?): DecryptionResult {
+        return DecryptionResult(content = content, isEncrypted = true, filename = filename)
+      }
+    }
+  }
+
+  data class KeyWithPassPhrase(
+    val keyRing: PGPSecretKeyRing,
+    val passphrase: Passphrase?
+  )
+
+  fun decrypt(
+    data: ByteArray,
+    keys: List<KeyWithPassPhrase>,
+    pgpPublicKeyRingCollection: PGPPublicKeyRingCollection? // for verification
+  ): DecryptionResult {
+    if (data.isEmpty()) {
+      return DecryptionResult.withError(DecryptionErrorType.FORMAT, "Can't decrypt empty message")
+    }
+
+    val chunk = data.copyOfRange(0, data.size.coerceAtMost(50)).toString(StandardCharsets.US_ASCII)
+    var input = data.inputStream() as InputStream
+
+    if (chunk.contains(ARMOR_HEADER_DICT[MsgBlock.Type.SIGNED_MSG]!!.begin)) {
+      val msg: PgpArmor.CleartextSignedMessage
+      try {
+        msg = PgpArmor.readSignedClearTextMessage(input)
+      } catch (ex: Exception) {
+        return if (
+          ex is PGPException && ex.message != null && ex.message == "Cleartext format error"
+        ) {
+          DecryptionResult.withError(
+            type = DecryptionErrorType.FORMAT,
+            message = ex.message!!,
+            cause = ex.cause
+          )
+        } else {
+          DecryptionResult.withError(
+            type = DecryptionErrorType.OTHER,
+            message = "Decode cleartext error",
+            cause = ex
+          )
+        }
+      }
+      return DecryptionResult.withCleartext(msg.content, msg.signature)
+    }
+
+    val isArmored = chunk.contains(ARMOR_HEADER_DICT[MsgBlock.Type.ENCRYPTED_MSG]!!.begin)
+    if (isArmored) input = ArmoredInputStream(input)
+
+    val keyList: List<PGPSecretKeyRing>
+    try {
+      keyList = keys.map {
+        when {
+          KeyRingInfo(it.keyRing).isFullyDecrypted -> it.keyRing
+          it.passphrase == null -> throw PGPException("flowcrypt: need passphrase")
+          else -> PgpKey.decryptKey(it.keyRing, it.passphrase) // may throw PGPException
+        }
+      }.toList()
+    } catch (ex: PGPException) {
+      if (ex.message == "flowcrypt: need passphrase") {
+        return DecryptionResult.withError(
+          type = DecryptionErrorType.NEED_PASSPHRASE,
+          message = "Need passphrase"
+        )
+      }
+      return DecryptionResult.withError(
+        type = DecryptionErrorType.WRONG_PASSPHRASE,
+        message = "Wrong passphrase",
+        cause = ex
+      )
+    }
+
+    var exception: Exception? = null
+    try {
+      val d = PGPainless.decryptAndOrVerify()
+        .onInputStream(input)
+        .decryptWith(UnprotectedKeysProtector(), PGPSecretKeyRingCollection(keyList))
+
+      val decryptionStream = if (pgpPublicKeyRingCollection != null) {
+        d.verifyWith(pgpPublicKeyRingCollection).ignoreMissingPublicKeys().build()
+      } else {
+        d.doNotVerify().build()
+      }
+
+      val output = ByteArrayOutputStream()
+      decryptionStream.use { it.copyTo(output) }
+
+      val streamResult = decryptionStream.result
+      return DecryptionResult.withDecrypted(output, streamResult.fileInfo?.fileName)
+    } catch (ex: MessageNotIntegrityProtectedException) {
+      return DecryptionResult.withError(
+        type = DecryptionErrorType.NO_MDC,
+        message = "Security threat! Message is missing integrity checks (MDC)." +
+            " The sender should update their outdated software.",
+        cause = ex
+      )
+    } catch (ex: ModificationDetectionException) {
+      return DecryptionResult.withError(
+        type = DecryptionErrorType.BAD_MDC,
+        message = "Security threat! Integrity check failed.",
+        cause = ex
+      )
+    } catch (ex: PGPDataValidationException) {
+      return DecryptionResult.withError(
+        type = DecryptionErrorType.KEY_MISMATCH,
+        message = "There is no matching key",
+        cause = ex
+      )
+    } catch (ex: PGPException) {
+      if (
+        ex.message?.contains("exception decrypting session info") == true
+        || ex.message?.contains("encoded length out of range") == true
+        || ex.message?.contains("Exception recovering session info") == true
+        || ex.message?.contains("No suitable decryption key") == true
+      ) {
+        return DecryptionResult.withError(
+          type = DecryptionErrorType.KEY_MISMATCH,
+          message = "There is no suitable decryption key",
+          cause = ex
+        )
+      } else {
+        exception = ex
+      }
+    } catch (ex: Exception) {
+      exception = ex
+    }
+    return DecryptionResult.withError(
+      type = DecryptionErrorType.OTHER,
+      message = "Decryption failed",
+      cause = exception
+    )
+  }
 }
+//                   || ex.message?.contains("Invalid Curve25519 public key") == true
+//               || ex.message?.contains("ECDH requires use of PGPPrivateKey for decryption") == true
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt
index 31b4cd0411..a7eb74aab8 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/IdleService.kt
@@ -19,7 +19,7 @@ import androidx.lifecycle.switchMap
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
-import com.flowcrypt.email.extensions.lang.toHex
+import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.jetpack.lifecycle.ConnectionLifecycleObserver
 import com.flowcrypt.email.jetpack.viewmodel.AccountViewModel
 import com.flowcrypt.email.jetpack.workmanager.sync.InboxIdleMsgsAddedWorker
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt
index ab95ccb113..dc6391eb2e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/BackupPrivateKeyToInboxAction.kt
@@ -18,6 +18,7 @@ import com.flowcrypt.email.jetpack.viewmodel.AccountViewModel
 import com.flowcrypt.email.security.KeysStorageImpl
 import com.flowcrypt.email.security.pgp.PgpKey
 import com.google.gson.annotations.SerializedName
+import org.pgpainless.util.Passphrase
 
 /**
  * This action describes a task which backups a private key to INBOX.
@@ -50,7 +51,10 @@ data class BackupPrivateKeyToInboxAction @JvmOverloads constructor(override var
         encryptedKey = key.privateKey ?: throw IllegalArgumentException("empty key")
       } else {
         try {
-          encryptedKey = PgpKey.encryptKey(keyEntity.privateKeyAsString, keyEntity.passphrase!!)
+          encryptedKey = PgpKey.encryptKey(
+            keyEntity.privateKeyAsString,
+            Passphrase.fromPassword(keyEntity.passphrase!!)
+          )
         } catch (e: Exception) {
           throw IllegalStateException("An error occurred during encrypting some key", e)
         }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt
index 15ae2d66e7..adf1e5e9ec 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/EncryptPrivateKeysIfNeededAction.kt
@@ -24,6 +24,7 @@ import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.flowcrypt.email.util.exception.PrivateKeyStrengthException
 import com.google.android.gms.common.util.CollectionUtils
 import com.google.gson.annotations.SerializedName
+import org.pgpainless.util.Passphrase
 
 /**
  * This [Action] checks all available private keys are they encrypted. If not we will try to encrypt a key and
@@ -69,7 +70,10 @@ data class EncryptPrivateKeysIfNeededAction @JvmOverloads constructor(override v
 
       try {
         PgpPwd.checkForWeakPassphrase(passphrase)
-        val encryptedKey = PgpKey.encryptKey(keyDetails.privateKey!!, passphrase)
+        val encryptedKey = PgpKey.encryptKey(
+          keyDetails.privateKey!!,
+          Passphrase.fromPassword(passphrase)
+        )
 
         val encryptedKeyDetailsList = PgpKey.parseKeys(encryptedKey.toByteArray(), false)
             .toNodeKeyDetailsList()
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
index c02457495b..ab0d66d541 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
@@ -38,7 +38,7 @@ import com.flowcrypt.email.api.retrofit.request.node.DecryptFileRequest
 import com.flowcrypt.email.api.retrofit.response.node.DecryptedFileResult
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
-import com.flowcrypt.email.extensions.lang.toHex
+import com.flowcrypt.email.extensions.kotlin.toHex
 import com.flowcrypt.email.jetpack.viewmodel.AccountViewModel
 import com.flowcrypt.email.security.KeysStorageImpl
 import com.flowcrypt.email.util.FileAndDirectoryUtils
diff --git a/FlowCrypt/src/test/java/com/flowcrypt/email/core/msg/MsgBlockParserTest.kt b/FlowCrypt/src/test/java/com/flowcrypt/email/core/msg/MsgBlockParserTest.kt
index 0e504794d7..fad4d95368 100644
--- a/FlowCrypt/src/test/java/com/flowcrypt/email/core/msg/MsgBlockParserTest.kt
+++ b/FlowCrypt/src/test/java/com/flowcrypt/email/core/msg/MsgBlockParserTest.kt
@@ -8,7 +8,7 @@ package com.flowcrypt.email.core.msg
 import com.flowcrypt.email.api.retrofit.response.model.node.GenericMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.node.MsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.node.PublicKeyMsgBlock
-import com.flowcrypt.email.extensions.lang.normalize
+import com.flowcrypt.email.extensions.kotlin.normalize
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
diff --git a/FlowCrypt/src/test/java/com/flowcrypt/email/security/pgp/PgpMsgTest.kt b/FlowCrypt/src/test/java/com/flowcrypt/email/security/pgp/PgpMsgTest.kt
new file mode 100644
index 0000000000..2ac6b2f0e2
--- /dev/null
+++ b/FlowCrypt/src/test/java/com/flowcrypt/email/security/pgp/PgpMsgTest.kt
@@ -0,0 +1,269 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors:
+ *     Ivan Pizhenko
+ */
+
+package com.flowcrypt.email.security.pgp
+
+import org.bouncycastle.openpgp.PGPSecretKeyRing
+import org.junit.Test
+import org.junit.Assert.assertTrue
+import org.pgpainless.PGPainless
+import org.pgpainless.util.Passphrase
+import java.lang.IllegalArgumentException
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
+
+class PgpMsgTest {
+
+  private data class MessageInfo(
+    val key: String,
+    val content: List<String>,
+    val quoted: Boolean? = null,
+    val charset: String = "UTF-8"
+  ) {
+    val armored: String = loadMessage("$key.txt")
+  }
+
+  companion object {
+    private val privateKeys = listOf(
+      PgpMsg.KeyWithPassPhrase(
+        passphrase = Passphrase.fromPassword("flowcrypt compatibility tests"),
+        keyRing = loadSecretKey("key0.txt"),
+      ),
+
+      PgpMsg.KeyWithPassPhrase(
+        passphrase = Passphrase.fromPassword("flowcrypt compatibility tests 2"),
+        keyRing = loadSecretKey("key1.txt")
+      )
+    )
+
+    private val messages = listOf(
+      MessageInfo(
+        key = "decrypt - without a subject",
+        content = listOf("This is a compatibility test email")
+      ),
+
+      MessageInfo(
+        key = "decrypt - [security] mdc - missing - error",
+        content = listOf("Security threat!", "MDC", "Display the message at your own risk."),
+      ),
+
+      MessageInfo(
+        key = "decrypt - [security] mdc - modification detected - error",
+        content = listOf(
+          "Security threat - opening this message is dangerous because it was modified" +
+              " in transit."
+        ),
+      ),
+
+      MessageInfo(
+        key = "decrypt - [everdesk] message encrypted for sub but claims encryptedFor-primary,sub",
+        content = listOf("this is a sample for FlowCrypt compatibility")
+      ),
+
+      MessageInfo(
+        key = "decrypt - [gpg] signed fully armored message",
+        content = listOf(
+          "this was encrypted with gpg",
+          "gpg --sign --armor -r flowcrypt.compatibility@gmail.com ./text.txt"
+        ),
+        quoted = false
+      ),
+
+      MessageInfo(
+        key = "decrypt - encrypted missing checksum",
+        content = listOf("400 library systems in 177 countries worldwide")
+      ),
+
+      MessageInfo(
+        key = "decrypt - [enigmail] encrypted iso-2022-jp pgp-mime",
+        content = listOf("=E3=82=BE=E3=81=97=E9=80=B8=E7=8F=BE"), // part of "ゾし逸現飲"
+        charset = "ISO-2022-JP",
+      ),
+
+      MessageInfo(
+        key = "decrypt - [enigmail] encrypted iso-2022-jp, plain text",
+        content = listOf(
+          // complete string "ゾし逸現飲"
+          decodeString("=E3=82=BE=E3=81=97=E9=80=B8=E7=8F=BE=E9=A3=B2", "UTF-8")
+        ),
+        charset = "ISO-2022-JP",
+      )
+    )
+
+    private fun decodeString(s: String, charset: String): String {
+      val bytes = s.substring(1).split('=').map { Integer.parseInt(it, 16).toByte() }.toByteArray()
+      return String(bytes, Charset.forName(charset))
+    }
+
+    private fun loadResource(path: String): ByteArray {
+      return PgpMsgTest::class.java.classLoader!!
+        .getResourceAsStream("${PgpMsgTest::class.simpleName}/$path")
+        .readBytes()
+    }
+
+    private fun loadResourceAsString(path: String): String {
+      return String(loadResource(path), StandardCharsets.UTF_8)
+    }
+
+    private fun loadSecretKey(file: String): PGPSecretKeyRing {
+      return PGPainless.readKeyRing().secretKeyRing(loadResourceAsString("keys/$file"))
+    }
+
+    private fun loadMessage(file: String): String {
+      return loadResourceAsString("messages/$file")
+    }
+
+    private fun findMessage(key: String): MessageInfo {
+      return messages.firstOrNull { it.key == key }
+        ?: throw IllegalArgumentException("Message '$key' not found")
+    }
+  }
+
+  @Test // ok
+  fun multipleDecryptionTest() {
+    val keys = listOf(
+      "decrypt - without a subject",
+      "decrypt - [enigmail] encrypted iso-2022-jp pgp-mime",
+      "decrypt - [enigmail] encrypted iso-2022-jp, plain text",
+      "decrypt - [gpg] signed fully armored message"
+    )
+    for (key in keys) {
+      println("Decrypt: '$key'")
+      val r = processMessage(key)
+      assertTrue("Message not returned", r.content != null)
+      val messageInfo = findMessage(key)
+      checkContent(
+        expected = messageInfo.content,
+        actual = r.content!!.toByteArray(),
+        charset = messageInfo.charset
+      )
+    }
+  }
+
+  @Test // ok
+  fun missingMdcTest() {
+    val r = processMessage("decrypt - [security] mdc - missing - error")
+    assertTrue("Message is returned when should not", r.content == null)
+    assertTrue("Error not returned", r.error != null)
+    assertTrue("Missing MDC not detected", r.error!!.type == PgpMsg.DecryptionErrorType.NO_MDC)
+  }
+
+  @Test // ok
+  fun badMdcTest() {
+    val r = processMessage("decrypt - [security] mdc - modification detected - error")
+    assertTrue("Message is returned when should not", r.content == null)
+    assertTrue("Error not returned", r.error != null)
+    assertTrue("Bad MDC not detected", r.error!!.type == PgpMsg.DecryptionErrorType.BAD_MDC)
+  }
+
+  // TODO: Should there be any error?
+  // https://github.com/FlowCrypt/flowcrypt-android/issues/1214
+  @Test
+  fun decryptionTest3() {
+    val r = processMessage(
+      "decrypt - [everdesk] message encrypted for sub but claims encryptedFor-primary,sub"
+    )
+    assertTrue("Message not returned", r.content != null)
+    assertTrue("Error returned", r.error == null)
+  }
+
+  @Test
+  fun missingArmorChecksumTest() {
+    // This is a test for the message with missing armor checksum - different from MDC.
+    // Usually the four digits at the and like p3Fc=.
+    // Such messages are still valid if this is missing,
+    // and should decrypt correctly - so it's good as is.
+    val r = processMessage("decrypt - encrypted missing checksum")
+    assertTrue("Message not returned", r.content != null)
+    assertTrue("Error returned", r.error == null)
+  }
+
+  @Test
+  fun wrongPassphraseTest() {
+    val messageInfo = findMessage("decrypt - without a subject")
+    val wrongPassphrase = Passphrase.fromPassword("this is wrong passphrase for sure")
+    val privateKeysWithWrongPassPhrases = privateKeys.map {
+      PgpMsg.KeyWithPassPhrase(keyRing = it.keyRing, passphrase = wrongPassphrase)
+    }
+    val r = PgpMsg.decrypt(
+      messageInfo.armored.toByteArray(), privateKeysWithWrongPassPhrases, null
+    )
+    assertTrue("Message returned", r.content == null)
+    assertTrue("Error not returned", r.error != null)
+    assertTrue(
+      "Wrong passphrase not detected",
+      r.error!!.type == PgpMsg.DecryptionErrorType.WRONG_PASSPHRASE
+    )
+  }
+
+  @Test
+  fun missingPassphraseTest() {
+    val messageInfo = findMessage("decrypt - without a subject")
+    val privateKeysWithMissingPassphrases = privateKeys.map {
+      PgpMsg.KeyWithPassPhrase(keyRing = it.keyRing, passphrase = null)
+    }
+    val r = PgpMsg.decrypt(
+      messageInfo.armored.toByteArray(), privateKeysWithMissingPassphrases, null
+    )
+    assertTrue("Message returned", r.content == null)
+    assertTrue("Error not returned", r.error != null)
+    assertTrue(
+      "Missing passphrase not detected",
+      r.error!!.type == PgpMsg.DecryptionErrorType.NEED_PASSPHRASE
+    )
+  }
+
+  @Test
+  fun wrongKeyTest() {
+    val messageInfo = findMessage("decrypt - without a subject")
+    val wrongKey = listOf(privateKeys[1])
+    val r = PgpMsg.decrypt(
+      messageInfo.armored.toByteArray(), wrongKey, null
+    )
+    assertTrue("Message returned", r.content == null)
+    assertTrue("Error not returned", r.error != null)
+    assertTrue(
+      "Key mismatch not detected",
+      r.error!!.type == PgpMsg.DecryptionErrorType.KEY_MISMATCH
+    )
+  }
+
+  // -------------------------------------------------------------------------------------------
+
+  @Test // use this for debugging
+  fun singleDecryptionTest() {
+    val key = "decrypt - [enigmail] encrypted iso-2022-jp, plain text"
+    val r = processMessage(key)
+    assertTrue("Message not returned", r.content != null)
+    val messageInfo = findMessage(key)
+    checkContent(
+      expected = messageInfo.content,
+      actual = r.content!!.toByteArray(),
+      charset = messageInfo.charset
+    )
+  }
+
+  private fun processMessage(messageKey: String): PgpMsg.DecryptionResult {
+    val messageInfo = findMessage(messageKey)
+    val result = PgpMsg.decrypt(messageInfo.armored.toByteArray(), privateKeys, null)
+    if (result.content != null) {
+      val s = String(result.content!!.toByteArray(), Charset.forName(messageInfo.charset))
+      println("=========\n$s\n=========")
+    }
+    if (result.error != null && result.error!!.cause != null) {
+      println("CAUSE:")
+      result.error!!.cause!!.printStackTrace(System.out)
+    }
+    return result
+  }
+
+  private fun checkContent(expected: List<String>, actual: ByteArray, charset: String) {
+    val z = String(actual, Charset.forName(charset))
+    for (s in expected) {
+      assertTrue("Text '$s' not found", z.indexOf(s) != -1)
+    }
+  }
+}
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/keys/key0.txt b/FlowCrypt/src/test/resources/PgpMsgTest/keys/key0.txt
new file mode 100644
index 0000000000..f7b4c3b275
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/keys/key0.txt
@@ -0,0 +1,116 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: FlowCrypt 6.9.1 Gmail Encryption
+Comment: Seamlessly send and receive encrypted email
+
+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
+tiL0VgGWS0GVL1cZMUwhvvu8bxI=
+=2z30
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/keys/key1.txt b/FlowCrypt/src/test/resources/PgpMsgTest/keys/key1.txt
new file mode 100644
index 0000000000..e82c976db6
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/keys/key1.txt
@@ -0,0 +1,116 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: FlowCrypt 6.9.1 Gmail Encryption
+Comment: Seamlessly send and receive encrypted email
+
+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
+vzeD7/aV7tSBoODcfMmAS7jLnHo=
+=OKth
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [enigmail] encrypted iso-2022-jp pgp-mime.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [enigmail] encrypted iso-2022-jp pgp-mime.txt
new file mode 100644
index 0000000000..82c5c55a1d
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [enigmail] encrypted iso-2022-jp pgp-mime.txt	
@@ -0,0 +1,46 @@
+-----BEGIN PGP MESSAGE-----
+
+hQIMA0taL/zmLZUBAQ/+JgpmkgscJEB9uAiFT6TbeZsBqD/rRDInab9OevrRBWOZ
+wQ7UxS4OkM8M1joflEgtP1ZjNkCCuOG5RXR3JZFkUeQbvtMc4mpx+OOjYbwHwNNE
+05wbcIHn380axNPWMYqe8/iCK9wFWhMDwtpDfJ0PzLKAhnjFhymMWjmXB2avejaS
+iaKQRelmUiNt5Tk6FAu8UnOAbr7+uLvFBzzjyELL3pGzDBLkawhUT2QZ2nqrC1Ns
+J8HEXnl0TBI5T9rlK5i6YQi2i26SWk8QkM0ov5OWVK1qISf15VHeP5uLXch3MfHu
+EfQEubo378Jbka9QMo1/E/8ublGQReMpsvbrWto9HqfPSXUGe3hUQcIRi3nKuQBx
+nbMWonnNE7UEhBFytLL2w+MmBDlkePa7zDngOjQwLpYNVvrxJnCjk6Skcrn+x20D
+YkGziEubqhquMRLxJht4UTLuRSLI8j1NtIRZ5Q9Bi+1krSJz527cbq/IFBU+EmNV
+fCcR1nYbF5/hyTwB7aZQyxCVlRWKlYfwv4+7q9cj5wCBuLCY7ZKucEbzodehRcEt
+4C8Txg2KkD7/8+Tt60KcqjvyDtQkQYNSaubugsG2BAmJpYRU6KFVGDlpNe6gGEQI
+hnVQq5UaZ9z0DcevE25Xr7fg2mLN7yHRRSauvOGlMnP98d3gDluQlbvAzk5qOMqF
+AgwDqn0MG9+UHywBD/sHF58ogxK3kAbITjA453U15KkR4bAqcH343mPfjPOPTyAb
+3IMoYbQV9SbHuptav6t9rhtrGEkNVunLQLrGYNbwrQx253yqgN+dRYD8mn101yJM
+FcN3R6PDCxAL4hW0cXjSspaqe1mx8U7pz+Ln1DrC4X8O9HHgMrPvUl18Uc14fAkw
+Zm+wk5vzVYxHp8WsQXb9xpe1imlew7jPuHZkNSA4k6YDoGn/wpN3mEOKE3BYq6Ro
+hnTaapIe+JIzsa/H0HXKcD0ztFeRUEyyjd+dE3vdJYehZrEQIjsM0ocqbn5tcf1W
+9DP0OXGylTfNbBMT6PQ4N5gfyQDext9Z3QOT0c3HcmUYHJd865jR5nXHGzsGW+Ur
+d0Z6AaCsSCP8WPUNixLzgCdB7EQ6Z5PB4etj9+FmKYvEbFiaOr9hrY48ny+iOJjq
+s0dudhgZkE8XpA9jcJaGnM4UZdFnssiTydlqaFWYwjVk8d4CsjrsTx+JNRWOSVHy
+9WBbUFQc1eH01rv1sfL467Eyzhh92SCfHooHN9lLtF2mDh43ZQu0ReW8aBd7RzHc
+KJC8E0wcslzLqfF+x7rh0Vt54Y3i0PS9H9RDWATssCx0V3ySwbnxqme6zIa5qKUN
+kbSqkucmzZKnaksb46S0zJyOB+QV/8ntYErmLsX1pGFvPFBm0+GQ/yQgpUiJhtLp
+AW8jKCFMyQBHhBKyG0k8Dn9f5mO8rE0xG982m+nGwlMKJunn+iiyz561V/2ebb5e
+RPCj12RUAIzKicPqRaPCaXhEyD30y1rDCHO7vpCB1CgnbVfRcPvTOOuUlGlrMYWa
+ZlAyrc5RkAiSCLUJab9ZTf//T34dmP1p0bmIN3Mnwu3XsbEdZnoQxqPSl0UyfqiL
+4e5uGe2Za/rxykM9CuG0f8vtFWsoNhJkTugdZjfKUZdnyfdsmZhNbKlJcuB7prvb
+0Gl0/3fNns6qv++R/EGNHbZhSxw/qZXGBwGa0Y7hwwsA1Q6ObXgnZA1TDqFUhFk6
+/cDa8FlRD1jj9rKyeuwwLryRy/Lhoq1LL/WV+OiUB//SldGaHkqXv9+CJNhmNwEU
+iC5mZYyhGGbsVcBxuQigilyMpDQJJfcUiqfN8KL+N8ICpnuPGgaMQ97SLeHq2Mmm
+ehcEZwVQZGlCnQJNKmhbqqxJB7WmdBRKTDiBxE5qz5r3grB/5v+MbyM6G6MyAnkP
+A/UKX0QUZsPDR41XVWhZPTDo//Z6aIKJwlgB3E9vak2JkD4/pdgzyAM28HOTUyJ/
+SfBVLd+/jxHIVlm1IaLUAzvJjG0NFlXvD7Pkzs5pXmUf//bTdFXNA3uh7VBSGQMl
+kaeyuemQwiW2Ray4tYbUq/FCzl+8862JBY98w38natrA++WMLHIox0rhMIG/voyK
+U1+2KKgED414MsC309jn+P6WCZGKt34BXSfDp/RbgwP3X0QIxSYOxtmX8fjKlVPR
+9FPmkwFvIYsE14MSB16y2vxSEt8JFKoGhXRuVxlGoYuuZrpERfhynnkwSLkw0zln
+MNUUihw9AePivi6H0qy+7DpUy+41CW8nxkx/dePcdbAq84Y71FyfM7gbLu04EPZ0
+hTzzgSLDSWvLc7vWRGbqI1erQhfadQwiUzMd0YAyImWmnm003dxfRNNC0oCYDE8V
+3QGFqOmr4AqcbMGIWBGiP0LajmehJEv+8GkIkuDwQRtkgaAkHwDMigujFtraqGEn
+mduYmYBW88YDsXD9Jv24d4Pt2Ce7P4lc4DEAU3vqUMZFdIwHanjKSNr8O6aXXd0e
+wrFjc71tUTNGF0suNi+74ol0rlS1seQNiijulEW53ngK8z5brNSd1N56H/wcYx81
+qSyeqnGYHphNbpwhBTqHkURBlwygxI2+CuMSR96j49ko9AZZHYl6DBAqHLKYWHGi
+vqvpG/++FFy0AMSxjs//Ce5lTS3y3skfneaZ9sgH7o+UXCJ7Op+mtLdHGjn6
+=GAOS
+-----END PGP MESSAGE-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [enigmail] encrypted iso-2022-jp, plain text.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [enigmail] encrypted iso-2022-jp, plain text.txt
new file mode 100644
index 0000000000..62e6580f17
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [enigmail] encrypted iso-2022-jp, plain text.txt	
@@ -0,0 +1,35 @@
+-----BEGIN PGP MESSAGE-----
+
+hQIMA0taL/zmLZUBAQ//embFGVPRuVfiUujhLesQa6a4sbp/POQcAsy++O6tD/VA
+wrQtPhJeniYVFeOs+37MWy1PkOUn6AAvgasHtlMCVnthxavG1onImCJWyC0NdgYn
+hrIN9aPmOY7UGhVzpU/GTxE1WHJHGMMGShmKbt+JThtAvmufuDK1DSho3kcjGEs9
+wpY0DU0+9I7xEmobgQqK4jyzLBLNx4aHl2qurKSmjghmk1ZMW4oluckrDmmQ3AWT
+Z/q7bnbP1GDNJV8cxR7ed4k6HCzkrX+BxL308E8soLtg87occ18QoJAIRAHU0kx5
+JlS9+fh/jNwKanZJjCWv6hqZKz9iUocRZD9iPqh9dhjsKalqkRaxuPM2eJkZY+91
+jG8tsHYTLeY33A4aUpdA6FpNR8Uyz8Agv+x8/aFp8GxSNIuUumf6bSIk2Oudt/a6
+rWvZO+M+UK53a4k4ibxrkv4zsE8CbijjCP8BvUrA37023GEWkOHIyMoFFy0o06W1
+56wTP2bLmKbujeES+dkzjrr1r9X6oDBwpoPABKSAjIKFQKcxWvhMgz4WO3w61g3F
+E8U0Rlx4lB4Ce1I0qzu8S4hkaZ7sYcKJ/211pzsaf0BfxZQdrfyu5kse275YgTUA
+bObnoW2sAWg8fX9JwuL9JVArnJ+6AOQjvNG9fr/uM4thV/zwqBUWfQ0sasDjjxSF
+AgwDqn0MG9+UHywBD/9bMrHNk/qirxpfIRa9vZcZssXv7A61XUZy2IVum9+p9c4W
+swd23kQOfC/82Fx75CwMQ+zzdP7+5tqeNfm3/4vfObLCmszf1++j3nVxEEX8sWpC
+mgHobD3uZPwgShvgcy6ZHkfz+BrxqqTJIZ6xD03VgzmNg2cuAHD1YVUKbTHGYcKM
+CY0b+1VG6lv4f78xiB0v8aw/aPTvtx0rY2g0YZHaE0JXT59cMNTMORNiE8h8guLB
+lf6hcwctRN+sJw5oW/saXpgFJSzVbQrwp0a1b6Ftzqv+qyJL2+yay83RaPX+R7LR
+Jy9jPrwBbzwCVbJBBSfeQ0zXkeNAOso83rE13UjxPsl+kU0ajxy55K/P/cLO6KKs
+KtFN7UGo2jGelpqDoGU5FwOoGeEaYW+InrZryyV/A2bjw6Zmfbh0GMzls25fK/9O
+OJp/D0yqEmnkU60O6eDwwwxY7VNqmtuOTZ4z8PIaV9LWuftVOeOG99+9g6280CKF
+YYHAxgb559v70V50bk+Z91rdA1SnxSq9wOkUu2K1BmkTdqEO5jxWf04MGrvROZUA
+dIKQ+PYibnRo+SObBUn4Otlfhel1tJ9wWWjJLpGJ1Zm3FaoCVH/MnnvhF48Q5JNR
+SDnqTg4wWd51Tokcnz2PoPrxRN3jacI4d0GZiAtsmB28mcKjdB5UYoXEy2MazNLA
+yAHzCHRtOJ7eOcStwltwnbh67/RCK9OCegaiSOMAcsEciVXUpT+hVl8oMl6IvJDk
+Fq1CwOL8t3Oj3W2igPkm2EejHl1dkz2JXPHjfHqt24tTtWRa3xuotoSvMAy+tfKT
+Cwg67nQan/13hl3eF0XXLCD++aotGSahUePsgZU79oedY2vmcofUf743sZ/N6aMP
+gELzwyLm7LzcFLjeokhNUDYpBgrH5+FcFZqpiTQhILONSvenncP4k3FDjC87DG5J
+yIckBN1KeU219vaYHEkmSmU3egfEYRMw2HznFAaiMEAnDoGs0ZTqNOx75ktZLpfS
+779APSTDmS/hsXXo7D8/myYWO5RMxFzGL7SIcXkosqa+TS3FJ5198epH0xLNrDhM
+1lMO2ZU5qb2TNA+WvSviiwWsZ+yj6kD1rzrvEg++q1b67s3oogP08wwHcfX+UiND
+vdGeVd2YFPX0kszhtfJDEYAkJ8ERe5RKQqeNXdk8XMYq2irp3AVBTBDkgTgMDPSU
+CI3g89S3eldT
+=P4O8
+-----END PGP MESSAGE-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [everdesk] message encrypted for sub but claims encryptedFor-primary,sub.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [everdesk] message encrypted for sub but claims encryptedFor-primary,sub.txt
new file mode 100644
index 0000000000..a9b20e4756
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [everdesk] message encrypted for sub but claims encryptedFor-primary,sub.txt	
@@ -0,0 +1,30 @@
+-----BEGIN PGP MESSAGE-----
+
+wcFMA62sJ5yVCTIHAQ/8CkcWeLmCy8lvANll0KbA9ymThNOmZjblBNRZvgT8DqaL
+haGXzHaMGHvi0d66P38RXfDc+H9l/jGtdS1zgiMJMpCUFtDc3OPgOuA93sReqBsq
+7fv5a+LSdfFZUPgUkXM2ur0eA+niNE+G3mbDcr/cuILYI8xTs6xbHRIKVl2G09eS
+BZMEyqH3duIAi0M42r4L/uvABTcEyVKvY/QHFmFTj1tSzqSD5PDv+nN0ihNR16R9
+N56PMcZazvTdChhXuA3MNciKoJtbZ785c/dwRL8bz8rr7Wj6iF+3Qm6kgbkef/o4
+6D8u8G1eDfSWuwtXVqIOuokd/mYgNIVZwt1sJukuGv3eL76b7Mhk3lCEjE8uSOf9
+N9mbLErel5VUTzNTVpA336aBnMKjEsJUIOg0sU0q8XAKeSjcrIuBrsaKpjq7WDXp
+FA2eQkpHpwZnlWjVMOYRREdji3G/t32ATTchNXl9zhQsioqQbfUtWkj2WvltE5oz
+O85ddVUniqpQPdQaojZ5+dPZ8SBC/4eUp3z4J4/b0fWSTPl/tLblFy1HJs0lKG5Z
+8AaoCGF5TLPoygXjBk0ImikeIGlYIShVOqG36RJlMh4xOQCmY0g9nz9LdCEHJ+uC
+kWh/oREBhSMnqlmn1ic/DG16h17E/tiOuOxsqTfIGlkLSShXDoiTjxgm527FA5HB
+wUwDS1ov/OYtlQEBD/9f6jwJxYjdBo2pUy5c+gA47BtW/zz12MKhRAHd+/bVbTv6
+5JhlBw1Jow0ckjcbnDRqBP9EL+ErAlc2UzGa+42Ahrc2HlDvyMJCcxLt0Fa2nhXG
+YWGHsQbHxgbePWHozwun2RXaAvvBonhBaYtcn0QPNEtArB9uyO4YqXXoH1/l0/gh
+IAzuR+LNymwdOBXpyiVFMJb6xyQF40aT31kI8Ge+UkBbkWDphcEPogd59krBEpwz
+fBfPdlGoTrSwfbKbshM0kiEbPh+ESMVvypg+PZo1Qp0eXYt7gjlYYqNzQHWobTTr
+IQjY3T8vml7XlcPzxLFqvQliuIZyRLczvm+wDhTj+J/dXAK0SHE/9XdqKY014j5t
+WjUfy9iD6seZ85ntAWdxHmOkytANe3QfyVxbO3N31nFe4uqJmW0RaEDx0em3k9YM
+YLe5OwK/49IpUj5gV1R3wnN0uNOZNOdhkyVJynLDJXV5DLoWO3yGMPM3iM+ZGujk
+4QrpXjVFscfTHy/5+bNFGHnapljzli9cbKqt3j610wLQa1pHj6K3xJOANwr0Vdjy
+BFGwpREQDPceSNREFA+7FdPh7WQe7P5NbfYuBXGZZeIvRZ6R0EHi8Agxn1426qYJ
+EJNr+qO2r49EhfCdwbizRLhBsqMJQIirkf5sI4w5RIgpI9ggkv/gQiqxvqFcDdK7
+AVK+eZiB2bvY3SVaH49hWaCE1OZ28gDYPlce6ARxznq1eqQhvgUyOffjpDjPgSkF
+QhQCj6/le9lunPkNKEYUhFr2eBBabBejRAsdLTOslG3yltICpBjHGqOB2CaDlHgL
+a5eoeqHusBAx9fmYtd0Zi474cGay8RjGtq/E+8wDTsupnYGbsHF5pDXC7erW9gyZ
+MzIE8wAZ+IxbhG7JXVtHaPWAbvl1ac7YBV7rpBYRKuvZvDQ9BL/tYy59HA==
+=t1CY
+-----END PGP MESSAGE-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [gpg] signed fully armored message.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [gpg] signed fully armored message.txt
new file mode 100644
index 0000000000..d579d366a2
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [gpg] signed fully armored message.txt	
@@ -0,0 +1,19 @@
+-----BEGIN PGP MESSAGE-----
+
+owGbwMvMwMVYfy8j1GPd8g7GNXlJHCWpFSV6JRUlcSH3akoyMosVyhOLFVLzkosq
+C0pSUxTKM0syFNIL0rm4gISCrm5xZnoekEosys0vUtAtUkjLyS8Hq9VLzs8tSCzJ
+TMrMySypdEjPTczMAYkp6OnDrODqZDJmYWDkYpAVU2QJVTh1Tmeb3HLhpxtYYQ5i
+ZQK5goGLUwAmYl8mwDC3yqJ3RqXeax2n108b42sc+I29zE1fLvdgq1Tz3ZL0a2Z5
+XSTDobXyoiGnj748k/8iX7dJYc5C+TTmPMXtPmYJKmd7V7v2x6675BfR+m25ednr
+PfEB9k+47iQ9yNsgu9TG8NC/hhccalMkT1UUcv7V07mW2ZRbfvSop1ZSU/bXm3c/
+8nd+ZShfmrHQYMMfe3Xmildmbhs2f7S6I8G+yamhrH1XsnXKlc/ca63S53TU7u5e
++X7vil97zTc3cDgtP/uw6GB6mmTo8mqlb20GytG1LuYzZftP55XYL7XyO5M8Rzx2
+ZcLBPTsfzs8o6bgxt0fBucIlds7nzLOyKld+G2u+uSqzuj9wgpeOSX149f+8y7N/
+hl5nbXIo3qL3QXaWwsXvh7fITVp155/bxSXKX65fuLmh+ET24Z9C7V8iGf9M7v76
+tI+jSNRu7cnAttxlX4tOGHhtuMH+TU8nNv1cPEc1X/H1VRv95mWabl3lP+HVmou/
+rkyN1/sWl7tS/fZP3vVlp3MSPvqy/P6T3VKhXSYdWFzhyblB6KhqzAbBuuVf/2bY
+KRx1239v9uZrM3yEZOc0JtzNz7Lh7xb6e89tIne4blx81aRT7b86YroUHGfe0PF4
+sHjRnQWdmeU2kgcmH+LUEdxd4bJgx/SQwPrb+6zieQ0mLbDsvZm7gHFPeq5ZW+/e
+BU8/cNc2bd49KWrdT8/zKpJ9KmvV9uz4AQA=
+=r8So
+-----END PGP MESSAGE-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [security] mdc - missing - error.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [security] mdc - missing - error.txt
new file mode 100644
index 0000000000..7ec052449d
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [security] mdc - missing - error.txt	
@@ -0,0 +1,33 @@
+-----BEGIN PGP MESSAGE-----
+Version: FlowCrypt 5.5.9 Gmail Encryption flowcrypt.com
+Comment: Seamlessly send, receive and search encrypted email
+
+wcFMA0taL/zmLZUBAQ/7Bwida5vvhXv5Zi+qJbG/QPst11jWfljDQlw1VLzF
+ou8ofoIEHpvoFgXegZUnoQXBmlHGD+XLs9jG/TV1mtE2RWq4hDtqiTQ6rEIa
+brN3Nx77Yr+4EN1aKI20aTLEPTIjVU2GH2i9DAmjHteBU3nkL9Z3yecB8Pn8
+EdhpCRY6cj2yrhJ5MPwmXrus9OFv39wA2DqYpqW5Be+KD8mipZ2CtJo5xtin
+aeEhpWSDsdg26rjx1nz4dA0NcFzZK2p/BPfPIFzRvmoXoWFigpUnwryEoCqX
+/tgmcrv7PqiYT5oziPmMuBc1lb7icI/Aq69uXz2z6+4MJHOlcTEFygV36J+1
+1opcjoX+JKJNn1nvHovBxuemcMwriJdmDj4Hmfo4zkd6ryUtGVrMVn8DbRp6
+TWB/0MSE8cmfuiA5DgzdGbrevdL6RxnQDmalTHJ5oxurFQVoLwpmbgd36C4Q
+xMfG1xEqFn5zvrCTGHg2OfS2cynal8CQDG0ZQCoWwdb0kT5D6bx7QKcuyy1/
+1TXKnp1NamD5Uhu1+XuxD7EbvDYUWYh3bkqgslsoX+OUl+ONdtMD5PswArd5
+KisD9UJuddJShL4clBUPoXeNrRxrU6HqjP5T4fapK684MeizicHIRpAww7fu
+Z8YtaySZ/hoOAKWsx0rV4grgJV7pryj4ARBRa1pLL9rBwUwDS1ov/OYtlQEB
+D/47fyD/6BvepqWmZXj7VLl2y63eE0b/6hf5K+Izv5A/+5l/EnjFx0rq+qeX
+6hftYZBUAbbBvKfxq9D5xsWg3tnhFv2sYIE3YpkCSzZpWJmahHwQOVNT0ASw
+gbO25OiTPlYPqfSkGYe0palbL+4T5dLOwVilmrZ2bQf/rLePwA4RQpWDPYio
+NDU0Xfi7TQcHQrZTpwFbVzNPXgCHnQkqF+s0v8RDJHnt9vVs2KEpi49V/YgN
++gZnZOeADL0rbre/PrIck1YSjZLbrWtQVk4+sCf0TjvixJ7MNjA4NgdZPo0M
+Hke/9XBFie3NiZaW/cEIVZ7WnjB3IbhkmOMJd4LgdHKgmswJwCYm+XvpOI19
+FzU1vzZmfOA1nEJSuuCDNVUoKYIQA5UEYJrVJeGnVN5sU5jkdlX9xPtYceww
+YFmLisuf9Ev0HC7v27KwYQRDPNYRA8GeK/jY6aZdg+VccsnzEigdYL5Tm4JI
+Zrxp/G807bZvt0yZwWh0gpWOFgbVgrm4Hpji5ilDyulZSW+8nJxB5tDoPzL4
+j4w9malje0c60GWNtiyCPLURyN63C2q144UpQjSU5r66oP1yF2A97aXKbf4p
+qO7cSNWEOTpqJkJrNFVKQdWvXZ+mvW1PQFmkkwish2HiQIXmWb04uV1pI8hR
+6YWk2ox9aZiJ664MpncgyJ5uIMlzVfYrX+AZRtBW36RgCTprIv6l1M5NcHMy
+zEscTaSY/e+pM5HzQKSzX+zHLa5kk5L7veX+1G33saiqSJ/fK13+k7qDNZQD
+nbtaebfh2JS0Pdbub6FUFjPHR5PydU9ltuppGEeYrOe1SxwiZ6BZfIXO2/8M
+hA==
+=B/NE
+-----END PGP MESSAGE-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [security] mdc - modification detected - error.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [security] mdc - modification detected - error.txt
new file mode 100644
index 0000000000..73e8ef38ef
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - [security] mdc - modification detected - error.txt	
@@ -0,0 +1,33 @@
+-----BEGIN PGP MESSAGE-----
+Version: FlowCrypt 5.5.9 Gmail Encryption flowcrypt.com
+Comment: Seamlessly send, receive and search encrypted email
+
+wcFMA0taL/zmLZUBAQ/+KvSED2vb9fJMQd6lRTh0idC7srhg4ESSf4ggCXFE
+deOq2IkV5dNhgWGGawFVVUTewMh3L3JklDoONlatBthc2OGNu+Fyu5No7hhG
+3Jq1GkNwCqex0+G+GVhlZfN2LOAx855H9m/AGxYo6KLU+ROmPZV8PZo5YJPr
+r8TrhhfHF/PG4ZmQIcuvPI1e0ivgF74wP4cG0qaPEacvSxQ1ZuDwzdqC1kGv
+seOTJEhpBG/D8YfbzUXVrX4GiOzIu2OhnlKfU6c0BJCTz+qmQRqYOZXLvKgd
+nU0RzfLgMsd7Sy1lCpld1syY3bT4l0FIRWUtVx1NrJ7cluicEPDiqJsEZntS
+Yy1ViiRZlnk2Xvx1Qpsh7fifUS8e9gfwPevYFhZ/b6SeqpRFRDFGa0uP9L5C
+/CcWqiUaLUL8nF51CYzfIMeIEGBk0TiVUAn19mkQTFbtbIB9K3uQHjFzgnrL
+nLaJ08Eme5NugtJMUIW7bgo4CAddRjj0isFsoesUv75/mEsHJ7JRPICnWx4b
+LPKOyP0anN6TYDgTC6IqvMOoNi0ZPEIpmGmf7ZOWjR4eUT+9uBmBHEPwGbLQ
+85Mcjy1C7X+0uUkIPsqXgF7Ya/pwTuZ8mDtF/FU3kR87y3jlDZ+3ltq+Y+5A
+BJyMGXGf24+SquE1Q+ONIzBwBqwXuYvRJwqA9vOtZ1PBwUwDS1ov/OYtlQEB
+D/0R6LMWFQHZQCIFkvXcB5r4X3J68tcLffAIVs+JnoyR6JECUuCZJdKLc4Aa
+F+A15GKiOnf5Z8RIg3Fn3nXuyN5rlWOu0yOO/XrnCSMHiYErTLUO6+6V6+by
+i+POAtAWptnJ7rGSAy17ZgIYD9WNPdX8Bv1fWEOJII2rj+5CVyBsOZWrnlnP
+HjHOQ6gHop7bnQlrpmpA95PLhyoW1LkEIoC0jgrGF+0QXRqEfdwpQBCklZyL
+/WAsG2GJLrHUgQALgpTys6/5P7VP+VSOaEnOJJExIZPkRVRFzWlYq1avgJWw
+EFGmKeg335/iThKBFQ8JsH9U22G5DD1BcfX+qtm4n640zC5pHRpLJO6ggiCJ
+ZA1SCtq6TBSF1FTa158ZNgjkiGZfS+oZvrMW+S1691vMmJrwqiRlPg9PXCA+
+ouGrU/1FVyRKGx1/Uki/h9SaxDX/3uHOOwJzytNxGMJP/4Y1Y6hbDwDzcrCM
+FlFHXiNbfB3uxiHD9wWHE44z91MkqOb7/ajoLXA8J8U3KJGFa+8JkZleRVnq
+r/UT8ppv0/ozWzV59mTulYzRdIPSy6r4V0bH16XGwZtHVrljOi4TrkExB9cS
+TdcX96RMMYpJ7p7dGcxoHaRBY120BD+sJ51jGi/YupoZBdbg7KcOAEelD2/F
+LM1LzR9f3HUaYyKvdPL+C0OwINKCAZBPShfECZOiqrNWgHLWddAdXqexZFLH
+0y7td11E7UNcCZegIlwOYksW7yuuCZ2ZLLnfx/u1G18nKBCealqNkaow/Pj7
+4q+0UYxfZnAl/rFuTK9ndd8tWMSm/6xzWEbqe/8NKJrCwk/nu+pvF+MuRvf5
+9DuzZFiNRQSjSxSYvkyLuw==
+=vxOj
+-----END PGP MESSAGE-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - encrypted missing checksum.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - encrypted missing checksum.txt
new file mode 100644
index 0000000000..8ab6c9ff78
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - encrypted missing checksum.txt	
@@ -0,0 +1,49 @@
+-----BEGIN PGP MESSAGE-----
+Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com
+Comment: Seamlessly send, receive and search encrypted email
+
+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
+-----END PGP MESSAGE-----
diff --git a/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - without a subject.txt b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - without a subject.txt
new file mode 100644
index 0000000000..0251626b4a
--- /dev/null
+++ b/FlowCrypt/src/test/resources/PgpMsgTest/messages/decrypt - without a subject.txt	
@@ -0,0 +1,42 @@
+-----BEGIN PGP MESSAGE-----
+
+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
+=HRui
+-----END PGP MESSAGE-----