From ee559b85074af79b69374b4d936f47f0ad0e5fb9 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Mon, 7 Nov 2022 17:20:58 +0200
Subject: [PATCH 1/4] Applied "kotlin-parcelize" plugin.| #1034

---
 FlowCrypt/build.gradle                        |  1 +
 .../email/api/email/model/AttachmentInfo.kt   | 59 +-------------
 .../email/api/email/model/AuthCredentials.kt  | 53 +------------
 .../email/api/email/model/AuthTokenInfo.kt    | 33 +-------
 .../email/api/email/model/ExtraActionInfo.kt  | 26 +-----
 .../api/email/model/GeneralMessageDetails.kt  | 72 +----------------
 .../api/email/model/IncomingMessageInfo.kt    | 42 +---------
 .../api/email/model/InitializationData.kt     | 30 +------
 .../email/api/email/model/LocalFolder.kt      | 45 ++---------
 .../api/email/model/OutgoingMessageInfo.kt    | 53 +------------
 .../email/api/email/model/SecurityType.kt     | 47 +----------
 .../email/api/email/model/ServiceInfo.kt      | 45 +----------
 .../response/api/EkmPrivateKeysResponse.kt    | 31 +-------
 .../api/retrofit/response/model/AttMeta.kt    | 31 +-------
 .../retrofit/response/model/DecryptError.kt   | 32 +-------
 .../response/model/DecryptErrorDetails.kt     | 31 +-------
 .../email/api/retrofit/response/model/Key.kt  | 25 +-----
 .../api/retrofit/response/model/MsgBlock.kt   | 17 +---
 .../retrofit/response/model/MsgBlockError.kt  | 16 +---
 .../api/retrofit/response/model/OrgRules.kt   | 68 +---------------
 .../response/model/VerificationResult.kt      | 34 +-------
 .../flowcrypt/email/database/MessageState.kt  | 15 +---
 .../email/database/entity/AccountEntity.kt    | 79 ++-----------------
 .../email/database/entity/KeyEntity.kt        | 16 +---
 .../email/database/entity/MessageEntity.kt    | 76 ++++--------------
 .../email/database/entity/PublicKeyEntity.kt  |  1 +
 .../email/database/entity/RecipientEntity.kt  | 27 +------
 .../entity/relation/RecipientWithPubKeys.kt   | 23 +-----
 .../com/flowcrypt/email/model/DialogItem.kt   | 30 +------
 .../flowcrypt/email/model/KeyImportDetails.kt | 37 +--------
 .../flowcrypt/email/model/KeyImportModel.kt   | 33 +-------
 .../email/model/MessageEncryptionType.kt      | 22 +-----
 .../com/flowcrypt/email/model/Screenshot.kt   | 18 +----
 .../flowcrypt/email/security/model/Algo.kt    | 33 +-------
 .../flowcrypt/email/security/model/KeyId.kt   | 27 +------
 .../email/security/model/PgpKeyDetails.kt     | 49 +-----------
 .../security/pgp/PgpDecryptAndOrVerify.kt     | 16 +---
 .../service/actionqueue/actions/Action.kt     | 17 +---
 38 files changed, 116 insertions(+), 1194 deletions(-)

diff --git a/FlowCrypt/build.gradle b/FlowCrypt/build.gradle
index 7a4c10edda..054e8fccc1 100644
--- a/FlowCrypt/build.gradle
+++ b/FlowCrypt/build.gradle
@@ -17,6 +17,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 apply plugin: "com.starter.easylauncher"
+apply plugin: "kotlin-parcelize"
 
 def keystoreProperties = new Properties()
 File propertiesFile = project.file("keystore.properties")
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt
index 1bdda9667d..f5cfb718d7 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.kt
@@ -6,12 +6,11 @@
 package com.flowcrypt.email.api.email.model
 
 import android.net.Uri
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.core.msg.RawBlockParser
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.security.SecurityUtils
+import kotlinx.parcelize.Parcelize
 
 /**
  * Simple POJO which defines information about email attachments.
@@ -21,6 +20,7 @@ import com.flowcrypt.email.security.SecurityUtils
  * Time: 18:38
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class AttachmentInfo constructor(
   var rawData: ByteArray? = null,
   var email: String? = null,
@@ -55,54 +55,6 @@ data class AttachmentInfo constructor(
     )
   }
 
-  constructor(source: Parcel) : this(
-    source.createByteArray(),
-    source.readString(),
-    source.readString(),
-    source.readLong(),
-    source.readString(),
-    source.readLong(),
-    source.readString(),
-    source.readLong(),
-    source.readString()!!,
-    source.readString(),
-    source.readString()!!,
-    source.readParcelableViaExt(Uri::class.java),
-    source.readByte() != 0.toByte(),
-    source.readByte() != 0.toByte(),
-    source.readByte() != 0.toByte(),
-    source.readByte() != 0.toByte(),
-    source.readInt(),
-    source.readByte() != 0.toByte(),
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    with(dest) {
-      writeByteArray(rawData)
-      writeString(email)
-      writeString(folder)
-      writeLong(uid)
-      writeString(fwdFolder)
-      writeLong(fwdUid)
-      writeString(name)
-      writeLong(encodedSize)
-      writeString(type)
-      writeString(id)
-      writeString(path)
-      writeParcelable(uri, flags)
-      writeByte(if (isProtected) 1.toByte() else 0.toByte())
-      writeByte(if (isForwarded) 1.toByte() else 0.toByte())
-      writeByte(if (isDecrypted) 1.toByte() else 0.toByte())
-      writeByte(if (isEncryptionAllowed) 1.toByte() else 0.toByte())
-      writeInt(orderNumber)
-      writeByte(if (decryptWhenForward) 1.toByte() else 0.toByte())
-    }
-  }
-
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false
@@ -168,12 +120,5 @@ data class AttachmentInfo constructor(
   companion object {
     const val DEPTH_SEPARATOR = "/"
     const val INNER_ATTACHMENT_PREFIX = "inner_"
-
-    @JvmField
-    @Suppress("unused")
-    val CREATOR: Parcelable.Creator<AttachmentInfo> = object : Parcelable.Creator<AttachmentInfo> {
-      override fun createFromParcel(source: Parcel): AttachmentInfo = AttachmentInfo(source)
-      override fun newArray(size: Int): Array<AttachmentInfo?> = arrayOfNulls(size)
-    }
   }
 }
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 fd1996115a..1b5bb11eff 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
@@ -5,11 +5,10 @@
 
 package com.flowcrypt.email.api.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.database.entity.AccountEntity
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes a details information about auth settings for some IMAP and SMTP servers.
@@ -19,6 +18,7 @@ import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
  * Time: 15:11.
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class AuthCredentials constructor(
   val email: String,
   val username: String,
@@ -37,47 +37,6 @@ data class AuthCredentials constructor(
   val displayName: String? = null,
   val authTokenInfo: AuthTokenInfo? = null
 ) : Parcelable {
-  constructor(source: Parcel) : this(
-    source.readString()!!,
-    source.readString()!!,
-    source.readString()!!,
-    source.readString()!!,
-    source.readInt(),
-    source.readParcelableViaExt(SecurityType.Option::class.java)!!,
-    source.readString()!!,
-    source.readInt(),
-    source.readParcelableViaExt(SecurityType.Option::class.java)!!,
-    source.readByte() != 0.toByte(),
-    source.readString(),
-    source.readString(),
-    source.readString(),
-    source.readByte() != 0.toByte(),
-    source.readString(),
-    source.readParcelableViaExt(AuthTokenInfo::class.java)
-  )
-
-  override fun describeContents() = 0
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    with(dest) {
-      writeString(email)
-      writeString(username)
-      writeString(password)
-      writeString(imapServer)
-      writeInt(imapPort)
-      writeParcelable(imapOpt, flags)
-      writeString(smtpServer)
-      writeInt(smtpPort)
-      writeParcelable(smtpOpt, flags)
-      writeInt((if (hasCustomSignInForSmtp) 1 else 0))
-      writeString(smtpSigInUsername)
-      writeString(smtpSignInPassword)
-      writeString(faqUrl)
-      writeInt((if (useOAuth2) 1 else 0))
-      writeString(displayName)
-      writeParcelable(authTokenInfo, flags)
-    }
-  }
 
   fun peekPassword(): String {
     return if (useOAuth2) authTokenInfo?.accessToken ?: password else password
@@ -88,14 +47,6 @@ data class AuthCredentials constructor(
   }
 
   companion object {
-    @JvmField
-    @Suppress("unused")
-    val CREATOR: Parcelable.Creator<AuthCredentials> =
-      object : Parcelable.Creator<AuthCredentials> {
-        override fun createFromParcel(source: Parcel): AuthCredentials = AuthCredentials(source)
-        override fun newArray(size: Int): Array<AuthCredentials?> = arrayOfNulls(size)
-      }
-
     fun from(accountEntity: AccountEntity): AuthCredentials {
       with(accountEntity) {
         var imapOpt: SecurityType.Option = SecurityType.Option.NONE
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthTokenInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthTokenInfo.kt
index 38d371aec5..f9fbf48b19 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthTokenInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AuthTokenInfo.kt
@@ -5,8 +5,8 @@
 
 package com.flowcrypt.email.api.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -14,37 +14,10 @@ import android.os.Parcelable
  *         Time: 4:57 PM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class AuthTokenInfo constructor(
   val email: String?,
   val accessToken: String? = null,
   val expiresAt: Long? = null,
   val refreshToken: String? = null
-) : Parcelable {
-  constructor(parcel: Parcel) : this(
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readValue(Long::class.java.classLoader) as? Long,
-    parcel.readString()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeString(email)
-    parcel.writeString(accessToken)
-    parcel.writeValue(expiresAt)
-    parcel.writeString(refreshToken)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<AuthTokenInfo> {
-    override fun createFromParcel(parcel: Parcel): AuthTokenInfo {
-      return AuthTokenInfo(parcel)
-    }
-
-    override fun newArray(size: Int): Array<AuthTokenInfo?> {
-      return arrayOfNulls(size)
-    }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ExtraActionInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ExtraActionInfo.kt
index 0f3ceeee53..72a63511b5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ExtraActionInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ExtraActionInfo.kt
@@ -8,13 +8,12 @@ package com.flowcrypt.email.api.email.model
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.extensions.android.content.getParcelableArrayListExtraViaExt
 import com.flowcrypt.email.extensions.android.content.getParcelableExtraViaExt
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.util.RFC6068Parser
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes information about incoming extra info from the intent with one of next actions:
@@ -30,34 +29,13 @@ import com.flowcrypt.email.util.RFC6068Parser
  * Time: 16:16
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class ExtraActionInfo(
   val atts: List<AttachmentInfo> = emptyList(),
   val initializationData: InitializationData
 ) : Parcelable {
 
-  constructor(parcel: Parcel) : this(
-    mutableListOf<AttachmentInfo>().apply { parcel.readTypedList(this, AttachmentInfo.CREATOR) },
-    requireNotNull(parcel.readParcelableViaExt(InitializationData::class.java))
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    dest.writeTypedList(atts)
-    dest.writeParcelable(initializationData, flags)
-  }
-
   companion object {
-    @JvmField
-    @Suppress("unused")
-    val CREATOR: Parcelable.Creator<ExtraActionInfo> =
-      object : Parcelable.Creator<ExtraActionInfo> {
-        override fun createFromParcel(source: Parcel): ExtraActionInfo = ExtraActionInfo(source)
-        override fun newArray(size: Int): Array<ExtraActionInfo?> = arrayOfNulls(size)
-      }
-
     /**
      * Parse incoming information from the intent which can have the next actions:
      *
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/GeneralMessageDetails.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/GeneralMessageDetails.kt
index b064554c6d..13ed793a01 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/GeneralMessageDetails.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/GeneralMessageDetails.kt
@@ -5,12 +5,10 @@
 
 package com.flowcrypt.email.api.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.database.MessageState
-import com.flowcrypt.email.extensions.android.os.readListViaExt
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import jakarta.mail.internet.InternetAddress
+import kotlinx.parcelize.Parcelize
 
 /**
  * Simple POJO class which describe a general message details.
@@ -20,7 +18,7 @@ import jakarta.mail.internet.InternetAddress
  * Time: 11:51
  * E-mail: DenBond7@gmail.com
  */
-
+@Parcelize
 data class GeneralMessageDetails constructor(
   val email: String,
   val label: String,
@@ -69,70 +67,4 @@ data class GeneralMessageDetails constructor(
 
       return emails
     }
-
-  constructor(source: Parcel) : this(
-    source.readString()!!,
-    source.readString()!!,
-    source.readInt(),
-    source.readInt(),
-    source.readLong(),
-    source.readLong(),
-    mutableListOf<InternetAddress>().apply {
-      source.readListViaExt(this, InternetAddress::class.java)
-    },
-    mutableListOf<InternetAddress>().apply {
-      source.readListViaExt(this, InternetAddress::class.java)
-    },
-    mutableListOf<InternetAddress>().apply {
-      source.readListViaExt(this, InternetAddress::class.java)
-    },
-    mutableListOf<InternetAddress>().apply {
-      source.readListViaExt(this, InternetAddress::class.java)
-    },
-    source.readString(),
-    source.createStringArrayList()!!,
-    1 == source.readInt(),
-    1 == source.readInt(),
-    1 == source.readInt(),
-    source.readParcelableViaExt(MessageState::class.java)!!,
-    source.readString(),
-    source.readString()
-  )
-
-  override fun describeContents() = 0
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    with(dest) {
-      writeString(email)
-      writeString(label)
-      writeInt(uid)
-      writeInt(id)
-      writeLong(receivedDate)
-      writeLong(sentDate)
-      writeList(from)
-      writeList(replyTo)
-      writeList(to)
-      writeList(cc)
-      writeString(subject)
-      writeStringList(msgFlags)
-      writeInt((if (isRawMsgAvailable) 1 else 0))
-      writeInt((if (hasAtts) 1 else 0))
-      writeInt((if (isEncrypted) 1 else 0))
-      writeParcelable(msgState, flags)
-      writeString(attsDir)
-      writeString(errorMsg)
-    }
-  }
-
-  companion object {
-    @JvmField
-    @Suppress("unused")
-    val CREATOR: Parcelable.Creator<GeneralMessageDetails> =
-      object : Parcelable.Creator<GeneralMessageDetails> {
-        override fun createFromParcel(source: Parcel): GeneralMessageDetails =
-          GeneralMessageDetails(source)
-
-        override fun newArray(size: Int): Array<GeneralMessageDetails?> = arrayOfNulls(size)
-      }
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt
index f8924163b7..aa2f80582d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/IncomingMessageInfo.kt
@@ -6,19 +6,17 @@
 package com.flowcrypt.email.api.email.model
 
 import android.content.Context
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.FoldersManager
-import com.flowcrypt.email.api.retrofit.response.model.GenericMsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.MsgBlock
 import com.flowcrypt.email.api.retrofit.response.model.VerificationResult
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.model.MessageType
 import jakarta.mail.internet.InternetAddress
+import kotlinx.parcelize.Parcelize
 import java.util.Date
 import java.util.regex.Pattern
 
@@ -30,7 +28,7 @@ import java.util.regex.Pattern
  * Time: 11:20
  * E-mail: DenBond7@gmail.com
  */
-
+@Parcelize
 data class IncomingMessageInfo constructor(
   val msgEntity: MessageEntity,
   var atts: List<AttachmentInfo>? = null,
@@ -220,40 +218,4 @@ data class IncomingMessageInfo constructor(
 
     return false
   }
-
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(MessageEntity::class.java)!!,
-    source.createTypedArrayList(AttachmentInfo.CREATOR),
-    source.readParcelableViaExt(LocalFolder::class.java),
-    source.readString(),
-    source.readString(),
-    mutableListOf<MsgBlock>().apply { source.readTypedList(this, GenericMsgBlock.CREATOR) },
-    source.readParcelableViaExt(MessageEncryptionType::class.java)!!,
-    source.readParcelableViaExt(VerificationResult::class.java)!!
-  )
-
-  override fun describeContents() = 0
-
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeParcelable(msgEntity, flags)
-    writeTypedList(atts)
-    writeParcelable(localFolder, flags)
-    writeString(text)
-    writeString(inlineSubject)
-    writeTypedList(msgBlocks)
-    writeParcelable(encryptionType, flags)
-    writeParcelable(verificationResult, flags)
-  }
-
-  companion object {
-    @JvmField
-    @Suppress("unused")
-    val CREATOR: Parcelable.Creator<IncomingMessageInfo> =
-      object : Parcelable.Creator<IncomingMessageInfo> {
-        override fun createFromParcel(source: Parcel): IncomingMessageInfo =
-          IncomingMessageInfo(source)
-
-        override fun newArray(size: Int): Array<IncomingMessageInfo?> = arrayOfNulls(size)
-      }
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/InitializationData.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/InitializationData.kt
index 3402311a9b..5e9a46706f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/InitializationData.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/InitializationData.kt
@@ -5,38 +5,14 @@
 
 package com.flowcrypt.email.api.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
+@Parcelize
 data class InitializationData(
   var subject: String? = null,
   var body: String? = null,
   val toAddresses: java.util.ArrayList<String> = arrayListOf(),
   val ccAddresses: java.util.ArrayList<String> = arrayListOf(),
   val bccAddresses: java.util.ArrayList<String> = arrayListOf()
-) : Parcelable {
-  constructor(parcel: Parcel) : this(
-    parcel.readString(),
-    parcel.readString(),
-    parcel.createStringArrayList() ?: arrayListOf(),
-    parcel.createStringArrayList() ?: arrayListOf(),
-    parcel.createStringArrayList() ?: arrayListOf()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeString(subject)
-    parcel.writeString(body)
-    parcel.writeStringList(toAddresses)
-    parcel.writeStringList(ccAddresses)
-    parcel.writeStringList(bccAddresses)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<InitializationData> {
-    override fun createFromParcel(parcel: Parcel): InitializationData = InitializationData(parcel)
-    override fun newArray(size: Int): Array<InitializationData?> = arrayOfNulls(size)
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/LocalFolder.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/LocalFolder.kt
index cd6710c75b..c98d5d032f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/LocalFolder.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/LocalFolder.kt
@@ -5,11 +5,12 @@
 
 package com.flowcrypt.email.api.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.api.email.FoldersManager
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.database.entity.LabelEntity
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 /**
  * This is a simple POJO object, which describe information about the email folder.
@@ -19,7 +20,7 @@ import com.flowcrypt.email.database.entity.LabelEntity
  * Time: 14:49
  * E-mail: DenBond7@gmail.com
  */
-
+@Parcelize
 data class LocalFolder constructor(
   val account: String,
   val fullName: String,
@@ -29,17 +30,6 @@ data class LocalFolder constructor(
   var msgCount: Int = 0,
   var searchQuery: String? = null
 ) : Parcelable {
-
-  constructor(source: Parcel) : this(
-    source.readString()!!,
-    source.readString()!!,
-    source.readString(),
-    source.createStringArrayList(),
-    source.readInt() == 1,
-    source.readInt(),
-    source.readString()
-  )
-
   constructor(source: LabelEntity) : this(
     source.email,
     source.name,
@@ -50,35 +40,16 @@ data class LocalFolder constructor(
     null
   )
 
+  @IgnoredOnParcel
   val isOutbox: Boolean = JavaEmailConstants.FOLDER_OUTBOX.equals(fullName, ignoreCase = true)
+
+  @IgnoredOnParcel
   val isAll: Boolean = JavaEmailConstants.FOLDER_ALL_MAIL.equals(fullName, ignoreCase = true)
+
+  @IgnoredOnParcel
   val isDrafts: Boolean = FoldersManager.FolderType.DRAFTS == getFolderType()
 
   fun getFolderType(): FoldersManager.FolderType? {
     return FoldersManager.getFolderType(this)
   }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeString(account)
-      writeString(fullName)
-      writeString(folderAlias)
-      writeStringList(attributes)
-      writeInt((if (isCustom) 1 else 0))
-      writeInt(msgCount)
-      writeString(searchQuery)
-    }
-
-  companion object {
-    @JvmField
-    @Suppress("unused")
-    val CREATOR: Parcelable.Creator<LocalFolder> = object : Parcelable.Creator<LocalFolder> {
-      override fun createFromParcel(source: Parcel): LocalFolder = LocalFolder(source)
-      override fun newArray(size: Int): Array<LocalFolder?> = arrayOfNulls(size)
-    }
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
index 11121d80ba..2fe9038783 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
@@ -5,14 +5,13 @@
 
 package com.flowcrypt.email.api.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
-import com.flowcrypt.email.extensions.android.os.readSerializableViaExt
 import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.model.MessageType
 import jakarta.mail.internet.InternetAddress
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 /**
  * Simple POJO class which describe an outgoing message model.
@@ -22,6 +21,7 @@ import jakarta.mail.internet.InternetAddress
  * Time: 11:20
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class OutgoingMessageInfo constructor(
   val account: String? = null,
   val subject: String? = null,
@@ -39,6 +39,7 @@ data class OutgoingMessageInfo constructor(
   val password: CharArray? = null
 ) : Parcelable {
 
+  @IgnoredOnParcel
   val isPasswordProtected = password?.isNotEmpty()
 
   /**
@@ -54,47 +55,6 @@ data class OutgoingMessageInfo constructor(
     return allRecipients
   }
 
-  @Suppress("UNCHECKED_CAST")
-  constructor(parcel: Parcel) : this(
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readValue(InternetAddress::class.java.classLoader) as List<InternetAddress>?,
-    parcel.readValue(InternetAddress::class.java.classLoader) as List<InternetAddress>?,
-    parcel.readValue(InternetAddress::class.java.classLoader) as List<InternetAddress>?,
-    parcel.readSerializableViaExt(InternetAddress::class.java),
-    parcel.readValue(AttachmentInfo::class.java.classLoader) as List<AttachmentInfo>?,
-    parcel.readValue(AttachmentInfo::class.java.classLoader) as List<AttachmentInfo>?,
-    parcel.readParcelableViaExt(MessageEncryptionType::class.java)!!,
-    parcel.readInt(),
-    parcel.readParcelableViaExt(MessageEntity::class.java),
-    parcel.readLong(),
-    parcel.createCharArray()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    with(dest) {
-      writeString(account)
-      writeString(subject)
-      writeString(msg)
-      writeValue(toRecipients)
-      writeValue(ccRecipients)
-      writeValue(bccRecipients)
-      writeSerializable(from)
-      writeValue(atts)
-      writeValue(forwardedAtts)
-      writeParcelable(encryptionType, flags)
-      writeInt(messageType)
-      writeParcelable(replyToMsgEntity, flags)
-      writeLong(uid)
-      writeCharArray(password)
-    }
-  }
-
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false
@@ -141,9 +101,4 @@ data class OutgoingMessageInfo constructor(
     result = 31 * result + (isPasswordProtected?.hashCode() ?: 0)
     return result
   }
-
-  companion object CREATOR : Parcelable.Creator<OutgoingMessageInfo> {
-    override fun createFromParcel(parcel: Parcel) = OutgoingMessageInfo(parcel)
-    override fun newArray(size: Int): Array<OutgoingMessageInfo?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/SecurityType.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/SecurityType.kt
index e6d3da1e76..2b2f9249e5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/SecurityType.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/SecurityType.kt
@@ -6,11 +6,10 @@
 package com.flowcrypt.email.api.email.model
 
 import android.content.Context
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.JavaEmailConstants
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes settings for some security type.
@@ -20,6 +19,7 @@ import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
  * Time: 14:35
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class SecurityType constructor(
   val name: String = "",
   val opt: Option = Option.SSL_TLS,
@@ -27,57 +27,16 @@ data class SecurityType constructor(
   val defSmtpPort: Int = 465
 ) : Parcelable {
 
-  constructor(parcel: Parcel) : this(
-    parcel.readString()!!,
-    parcel.readParcelableViaExt(Option::class.java)!!,
-    parcel.readInt(),
-    parcel.readInt()
-  )
-
   override fun toString(): String {
     return name
   }
 
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    dest.writeString(this.name)
-    dest.writeParcelable(opt, flags)
-    dest.writeInt(this.defImapPort)
-    dest.writeInt(this.defSmtpPort)
-  }
-
+  @Parcelize
   enum class Option : Parcelable {
     NONE, SSL_TLS, STARTLS;
-
-    companion object {
-      @JvmField
-      @Suppress("unused")
-      val CREATOR: Parcelable.Creator<Option> = object : Parcelable.Creator<Option> {
-        override fun createFromParcel(source: Parcel): Option = values()[source.readInt()]
-        override fun newArray(size: Int): Array<Option?> = arrayOfNulls(size)
-      }
-    }
-
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
   }
 
   companion object {
-    @JvmField
-    @Suppress("unused")
-    val CREATOR: Parcelable.Creator<SecurityType> = object : Parcelable.Creator<SecurityType> {
-      override fun createFromParcel(source: Parcel): SecurityType = SecurityType(source)
-      override fun newArray(size: Int): Array<SecurityType?> = arrayOfNulls(size)
-    }
-
     /**
      * Generate a list which contains all available [SecurityType].
      *
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ServiceInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ServiceInfo.kt
index da76cea61f..738488bc20 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ServiceInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/ServiceInfo.kt
@@ -5,8 +5,8 @@
 
 package com.flowcrypt.email.api.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes service info details. Can be used when create a new messages.
@@ -16,6 +16,7 @@ import android.os.Parcelable
  * Time: 10:57
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class ServiceInfo constructor(
   val isToFieldEditable: Boolean = false,
   val isCcFieldEditable: Boolean = false,
@@ -27,44 +28,4 @@ data class ServiceInfo constructor(
   val hasAbilityToAddNewAtt: Boolean = false,
   val systemMsg: String? = null,
   val atts: List<AttachmentInfo>? = null
-) : Parcelable {
-  constructor(parcel: Parcel) : this(
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readString(),
-    parcel.createTypedArrayList(AttachmentInfo.CREATOR)
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeByte(if (isToFieldEditable) 1 else 0)
-    parcel.writeByte(if (isCcFieldEditable) 1 else 0)
-    parcel.writeByte(if (isBccFieldEditable) 1 else 0)
-    parcel.writeByte(if (isFromFieldEditable) 1 else 0)
-    parcel.writeByte(if (isMsgEditable) 1 else 0)
-    parcel.writeByte(if (isSubjectEditable) 1 else 0)
-    parcel.writeByte(if (isMsgTypeSwitchable) 1 else 0)
-    parcel.writeByte(if (hasAbilityToAddNewAtt) 1 else 0)
-    parcel.writeString(systemMsg)
-    parcel.writeTypedList(atts)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<ServiceInfo> {
-    override fun createFromParcel(parcel: Parcel): ServiceInfo {
-      return ServiceInfo(parcel)
-    }
-
-    override fun newArray(size: Int): Array<ServiceInfo?> {
-      return arrayOfNulls(size)
-    }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/EkmPrivateKeysResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/EkmPrivateKeysResponse.kt
index 020685101f..b104ea7977 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/EkmPrivateKeysResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/EkmPrivateKeysResponse.kt
@@ -5,13 +5,12 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
 import com.flowcrypt.email.api.retrofit.response.model.Key
 import com.flowcrypt.email.security.model.PgpKeyDetails
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -19,42 +18,16 @@ import com.google.gson.annotations.Expose
  *         Time: 9:50 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class EkmPrivateKeysResponse constructor(
   @Expose val code: Int? = null,
   @Expose val message: String? = null,
   @Expose val privateKeys: List<Key>? = null,
   val pgpKeyDetailsList: List<PgpKeyDetails>? = null
 ) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readValue(Int::class.java.classLoader) as? Int,
-    parcel.readString(),
-    parcel.createTypedArrayList(Key),
-    parcel.createTypedArrayList(PgpKeyDetails)
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeValue(code)
-    parcel.writeString(message)
-    parcel.writeTypedList(privateKeys)
-    parcel.writeTypedList(pgpKeyDetailsList)
-  }
 
   override val apiError: ApiError?
     get() = if (code != null) {
       ApiError(code = code, msg = message)
     } else null
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<EkmPrivateKeysResponse> {
-    override fun createFromParcel(parcel: Parcel): EkmPrivateKeysResponse {
-      return EkmPrivateKeysResponse(parcel)
-    }
-
-    override fun newArray(size: Int): Array<EkmPrivateKeysResponse?> {
-      return arrayOfNulls(size)
-    }
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/AttMeta.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/AttMeta.kt
index ad58b317dc..646d9dc88e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/AttMeta.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/AttMeta.kt
@@ -5,9 +5,9 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 
 /**
@@ -16,6 +16,7 @@ import org.json.JSONObject
  *         Time: 10:16 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class AttMeta(
   @Expose val name: String?,
   @Expose var data: ByteArray?,
@@ -34,26 +35,6 @@ data class AttMeta(
     url = if (source.has("url")) source.getString("url") else null
   )
 
-  constructor(source: Parcel) : this(
-    name = source.readString(),
-    data = source.createByteArray(),
-    length = source.readLong(),
-    type = source.readString(),
-    contentId = source.readString(),
-    url = source.readString()
-  )
-
-  override fun describeContents() = 0
-
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeString(name)
-    writeByteArray(data)
-    writeLong(length)
-    writeString(type)
-    writeString(contentId)
-    writeString(url)
-  }
-
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false
@@ -82,12 +63,4 @@ data class AttMeta(
     result = 31 * result + (url?.hashCode() ?: 0)
     return result
   }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<AttMeta> = object : Parcelable.Creator<AttMeta> {
-      override fun createFromParcel(source: Parcel): AttMeta = AttMeta(source)
-      override fun newArray(size: Int): Array<AttMeta?> = arrayOfNulls(size)
-    }
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptError.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptError.kt
index 2678c7a842..b64e36fdf3 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptError.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptError.kt
@@ -5,12 +5,10 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
-
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -18,33 +16,9 @@ import com.google.gson.annotations.SerializedName
  * Time: 3:30 PM
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class DecryptError constructor(
   @SerializedName("error") @Expose val details: DecryptErrorDetails?,
   @Expose val fingerprints: List<String>?,
   @Expose val isEncrypted: Boolean
-) : Parcelable {
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(DecryptErrorDetails::class.java),
-    source.createStringArrayList(),
-    1 == source.readInt()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeParcelable(details, flags)
-      writeStringList(fingerprints)
-      writeInt((if (isEncrypted) 1 else 0))
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<DecryptError> = object : Parcelable.Creator<DecryptError> {
-      override fun createFromParcel(source: Parcel): DecryptError = DecryptError(source)
-      override fun newArray(size: Int): Array<DecryptError?> = arrayOfNulls(size)
-    }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorDetails.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorDetails.kt
index e3245ceb67..b6f5ed4aa4 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorDetails.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorDetails.kt
@@ -5,11 +5,10 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.security.pgp.PgpDecryptAndOrVerify
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -17,32 +16,8 @@ import com.google.gson.annotations.Expose
  * Time: 3:30 PM
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class DecryptErrorDetails(
   @Expose val type: PgpDecryptAndOrVerify.DecryptionErrorType?,
   @Expose val message: String?
-) : Parcelable {
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(PgpDecryptAndOrVerify.DecryptionErrorType::class.java),
-    source.readString()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeParcelable(type, flags)
-    writeString(message)
-  }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<DecryptErrorDetails> =
-      object : Parcelable.Creator<DecryptErrorDetails> {
-        override fun createFromParcel(source: Parcel): DecryptErrorDetails =
-          DecryptErrorDetails(source)
-
-        override fun newArray(size: Int): Array<DecryptErrorDetails?> = arrayOfNulls(size)
-      }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/Key.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/Key.kt
index a58228fbb9..14394027f5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/Key.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/Key.kt
@@ -5,9 +5,9 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -15,24 +15,5 @@ import com.google.gson.annotations.Expose
  *         Time: 2:48 PM
  *         E-mail: DenBond7@gmail.com
  */
-data class Key constructor(@Expose val decryptedPrivateKey: String? = null) : Parcelable {
-  constructor(parcel: Parcel) : this(parcel.readString())
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeString(decryptedPrivateKey)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<Key> {
-    override fun createFromParcel(parcel: Parcel): Key {
-      return Key(parcel)
-    }
-
-    override fun newArray(size: Int): Array<Key?> {
-      return arrayOfNulls(size)
-    }
-  }
-}
+@Parcelize
+data class Key constructor(@Expose val decryptedPrivateKey: String? = null) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlock.kt
index d84983b4d1..5d41926b46 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlock.kt
@@ -5,9 +5,9 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 interface MsgBlock : Parcelable {
   val type: Type
@@ -15,6 +15,7 @@ interface MsgBlock : Parcelable {
   val error: MsgBlockError?
   val isOpenPGPMimeSigned: Boolean
 
+  @Parcelize
   enum class Type : Parcelable {
     UNKNOWN,
 
@@ -75,23 +76,9 @@ interface MsgBlock : Parcelable {
     @SerializedName("decryptedAndOrSignedContent")
     DECRYPTED_AND_OR_SIGNED_CONTENT;
 
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
-
     fun isContentBlockType(): Boolean = CONTENT_BLOCK_TYPES.contains(this)
 
     companion object {
-      @JvmField
-      val CREATOR: Parcelable.Creator<Type> = object : Parcelable.Creator<Type> {
-        override fun createFromParcel(source: Parcel): Type = values()[source.readInt()]
-        override fun newArray(size: Int): Array<Type?> = arrayOfNulls(size)
-      }
-
       val KEY_BLOCK_TYPES = setOf(PUBLIC_KEY, PRIVATE_KEY)
 
       val WELL_KNOWN_BLOCK_TYPES = setOf(
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt
index 9dae17b0f5..d73b64c6f9 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt
@@ -5,9 +5,9 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -15,17 +15,7 @@ import com.google.gson.annotations.Expose
  *         Time: 10:27 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class MsgBlockError(
   @Expose val errorMsg: String? = null
-) : Parcelable {
-  constructor(parcel: Parcel) : this(parcel.readString())
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) = parcel.writeString(errorMsg)
-
-  override fun describeContents(): Int = 0
-
-  companion object CREATOR : Parcelable.Creator<MsgBlockError> {
-    override fun createFromParcel(parcel: Parcel): MsgBlockError = MsgBlockError(parcel)
-    override fun newArray(size: Int): Array<MsgBlockError?> = arrayOfNulls(size)
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/OrgRules.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/OrgRules.kt
index 9eda5371f1..452a5e61fa 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/OrgRules.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/OrgRules.kt
@@ -5,12 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.api.email.EmailUtil
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -18,6 +17,7 @@ import com.google.gson.annotations.SerializedName
  *         Time: 11:30 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class OrgRules constructor(
   @Expose val flags: List<DomainRule>? = null,
   @SerializedName("custom_keyserver_url")
@@ -44,32 +44,6 @@ data class OrgRules constructor(
       } else null
     }
 
-  constructor(parcel: Parcel) : this(
-    parcel.createTypedArrayList(DomainRule.CREATOR),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.createStringArrayList(),
-    parcel.createStringArrayList(),
-    parcel.readParcelableViaExt(KeyAlgo::class.java),
-    parcel.readValue(Int::class.java.classLoader) as? Int,
-    parcel.readValue(Int::class.java.classLoader) as? Int
-  )
-
-  override fun writeToParcel(parcel: Parcel, flagsList: Int) {
-    parcel.writeTypedList(flags)
-    parcel.writeString(customKeyserverUrl)
-    parcel.writeString(keyManagerUrl)
-    parcel.writeStringList(disallowAttesterSearchForDomains)
-    parcel.writeStringList(allowAttesterSearchOnlyForDomains)
-    parcel.writeParcelable(enforceKeygenAlgo, flagsList)
-    parcel.writeValue(enforceKeygenExpireMonths)
-    parcel.writeValue(inMemoryPassPhraseSessionLength)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
   /**
    * Internal company SKS-like public key server to trust above Attester
    */
@@ -239,6 +213,7 @@ data class OrgRules constructor(
     return flags?.firstOrNull { it == domainRule } != null
   }
 
+  @Parcelize
   enum class DomainRule : Parcelable {
     NO_PRV_CREATE,
     NO_PRV_BACKUP,
@@ -252,47 +227,12 @@ data class OrgRules constructor(
     HIDE_ARMOR_META,
     FORBID_STORING_PASS_PHRASE,
     RESTRICT_ANDROID_ATTACHMENT_HANDLING;
-
-    companion object CREATOR : Parcelable.Creator<DomainRule> {
-      override fun createFromParcel(parcel: Parcel): DomainRule = values()[parcel.readInt()]
-      override fun newArray(size: Int): Array<DomainRule?> = arrayOfNulls(size)
-    }
-
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
   }
 
+  @Parcelize
   enum class KeyAlgo : Parcelable {
     curve25519,
     rsa2048,
     rsa4096;
-
-    companion object CREATOR : Parcelable.Creator<KeyAlgo> {
-      override fun createFromParcel(parcel: Parcel): KeyAlgo = values()[parcel.readInt()]
-      override fun newArray(size: Int): Array<KeyAlgo?> = arrayOfNulls(size)
-    }
-
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
-  }
-
-  companion object CREATOR : Parcelable.Creator<OrgRules> {
-    override fun createFromParcel(parcel: Parcel): OrgRules {
-      return OrgRules(parcel)
-    }
-
-    override fun newArray(size: Int): Array<OrgRules?> {
-      return arrayOfNulls(size)
-    }
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/VerificationResult.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/VerificationResult.kt
index 52fdaabe48..ef1325cdd5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/VerificationResult.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/VerificationResult.kt
@@ -5,10 +5,10 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
 import android.os.Parcelable
-import com.flowcrypt.email.extensions.android.os.readListViaExt
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -16,6 +16,7 @@ import com.google.gson.annotations.Expose
  *         Time: 10:09 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class VerificationResult(
   @Expose val hasEncryptedParts: Boolean,
   @Expose val hasSignedParts: Boolean,
@@ -24,33 +25,6 @@ data class VerificationResult(
   @Expose val keyIdOfSigningKeys: List<Long>,
   @Expose val hasBadSignatures: Boolean,
 ) : Parcelable {
-
+  @IgnoredOnParcel
   val hasUnverifiedSignatures: Boolean = keyIdOfSigningKeys.isNotEmpty()
-
-  constructor(parcel: Parcel) : this(
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    parcel.readByte() != 0.toByte(),
-    mutableListOf<Long>().apply { parcel.readListViaExt(this, Long::class.java) },
-    parcel.readByte() != 0.toByte()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeByte(if (hasEncryptedParts) 1 else 0)
-    parcel.writeByte(if (hasSignedParts) 1 else 0)
-    parcel.writeByte(if (hasMixedSignatures) 1 else 0)
-    parcel.writeByte(if (isPartialSigned) 1 else 0)
-    parcel.writeList(keyIdOfSigningKeys)
-    parcel.writeByte(if (hasBadSignatures) 1 else 0)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<VerificationResult> {
-    override fun createFromParcel(parcel: Parcel) = VerificationResult(parcel)
-    override fun newArray(size: Int): Array<VerificationResult?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/MessageState.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/MessageState.kt
index fb14ac2706..f824dd445d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/MessageState.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/MessageState.kt
@@ -5,8 +5,8 @@
 
 package com.flowcrypt.email.database
 
-import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes the message states.
@@ -18,6 +18,7 @@ import android.os.Parcelable
  */
 //todo-denbond7 Modify [com.flowcrypt.email.database.dao.MessageDao.getFailedOutgoingMsgsCount]
 // if you add new states
+@Parcelize
 enum class MessageState constructor(val value: Int) : Parcelable {
   NONE(-1),
   NEW(1),
@@ -47,21 +48,9 @@ enum class MessageState constructor(val value: Int) : Parcelable {
   PENDING_UPLOADING_DRAFT(25),
   PENDING_DELETING_DRAFT(26);
 
-  override fun describeContents(): Int {
-    return 0
-  }
 
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    dest.writeInt(ordinal)
-  }
 
   companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<MessageState> = object : Parcelable.Creator<MessageState> {
-      override fun createFromParcel(source: Parcel): MessageState = values()[source.readInt()]
-      override fun newArray(size: Int): Array<MessageState?> = arrayOfNulls(size)
-    }
-
     @JvmStatic
     fun generate(code: Int): MessageState {
       for (messageState in values()) {
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 1e602ff968..713d769db2 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
@@ -6,7 +6,6 @@
 package com.flowcrypt.email.database.entity
 
 import android.accounts.Account
-import android.os.Parcel
 import android.os.Parcelable
 import android.provider.BaseColumns
 import androidx.room.ColumnInfo
@@ -19,9 +18,10 @@ import com.flowcrypt.email.api.email.gmail.GmailConstants
 import com.flowcrypt.email.api.email.model.AuthCredentials
 import com.flowcrypt.email.api.email.model.SecurityType
 import com.flowcrypt.email.api.retrofit.response.model.OrgRules
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.util.FlavorSettings
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -35,6 +35,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInAccount
     Index(name = "email_account_type_in_accounts", value = ["email", "account_type"], unique = true)
   ]
 )
+@Parcelize
 data class AccountEntity constructor(
   @PrimaryKey(autoGenerate = true)
   @ColumnInfo(name = BaseColumns._ID) val id: Long? = null,
@@ -77,12 +78,14 @@ data class AccountEntity constructor(
   @ColumnInfo(name = "use_fes", defaultValue = "0") val useFES: Boolean = false
 ) : Parcelable {
 
+  @IgnoredOnParcel
   @Ignore
   val account: Account = Account(
     this.email, accountType
       ?: this.email.substring(this.email.indexOf('@') + 1).lowercase()
   )
 
+  @IgnoredOnParcel
   @Ignore
   val isGoogleSignInAccount: Boolean = ACCOUNT_TYPE_GOOGLE.equals(accountType, ignoreCase = true)
 
@@ -193,38 +196,6 @@ data class AccountEntity constructor(
         useAPI = false
       )
 
-  constructor(source: Parcel) : this(
-    source.readValue(Long::class.java.classLoader) as Long?,
-    source.readString()!!,
-    source.readString(),
-    source.readString(),
-    source.readString(),
-    source.readString(),
-    source.readString(),
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readString()!!,
-    source.readString()!!,
-    source.readString()!!,
-    source.readValue(Int::class.java.classLoader) as Int,
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readString(),
-    source.readString()!!,
-    source.readValue(Int::class.java.classLoader) as Int,
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readString(),
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readString(),
-    source.readString(),
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readValue(Boolean::class.java.classLoader) as Boolean?,
-    source.readParcelableViaExt(OrgRules::class.java),
-    source.readValue(Boolean::class.java.classLoader) as Boolean,
-    source.readValue(Boolean::class.java.classLoader) as Boolean
-  )
-
   fun imapOpt(): SecurityType.Option {
     return when {
       imapUseSslTls == true -> {
@@ -257,48 +228,8 @@ data class AccountEntity constructor(
     return clientConfiguration?.hasRule(domainRule) ?: false
   }
 
-  override fun describeContents() = 0
-
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeValue(id)
-    writeString(email)
-    writeString(accountType)
-    writeString(displayName)
-    writeString(givenName)
-    writeString(familyName)
-    writeString(photoUrl)
-    writeValue(isEnabled)
-    writeValue(isActive)
-    writeString(username)
-    writeString(password)
-    writeString(imapServer)
-    writeValue(imapPort)
-    writeValue(imapUseSslTls)
-    writeValue(imapUseStarttls)
-    writeString(imapAuthMechanisms)
-    writeString(smtpServer)
-    writeValue(smtpPort)
-    writeValue(smtpUseSslTls)
-    writeValue(smtpUseStarttls)
-    writeString(smtpAuthMechanisms)
-    writeValue(smtpUseCustomSign)
-    writeString(smtpUsername)
-    writeString(smtpPassword)
-    writeValue(contactsLoaded)
-    writeValue(showOnlyEncrypted)
-    writeParcelable(clientConfiguration, flags)
-    writeValue(useAPI)
-    writeValue(useFES)
-  }
-
   companion object {
     const val ACCOUNT_TYPE_GOOGLE = "com.google"
     const val ACCOUNT_TYPE_OUTLOOK = "outlook.com"
-
-    @JvmField
-    val CREATOR: Parcelable.Creator<AccountEntity> = object : Parcelable.Creator<AccountEntity> {
-      override fun createFromParcel(source: Parcel): AccountEntity = AccountEntity(source)
-      override fun newArray(size: Int): Array<AccountEntity?> = arrayOfNulls(size)
-    }
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/KeyEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/KeyEntity.kt
index 1e029b6388..f555a8289d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/KeyEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/KeyEntity.kt
@@ -5,7 +5,6 @@
 
 package com.flowcrypt.email.database.entity
 
-import android.os.Parcel
 import android.os.Parcelable
 import android.provider.BaseColumns
 import androidx.room.ColumnInfo
@@ -14,6 +13,7 @@ import androidx.room.ForeignKey
 import androidx.room.Ignore
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
 import org.pgpainless.util.Passphrase
 
 /**
@@ -115,22 +115,12 @@ data class KeyEntity(
     return result
   }
 
+  @Parcelize
   enum class PassphraseType(val id: Int) : Parcelable {
     DATABASE(0),
     RAM(1);
 
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
-
-    companion object CREATOR : Parcelable.Creator<PassphraseType> {
-      override fun createFromParcel(source: Parcel): PassphraseType = values()[source.readInt()]
-      override fun newArray(size: Int): Array<PassphraseType?> = arrayOfNulls(size)
-
+    companion object {
       fun findValueById(id: Int): PassphraseType {
         return values().firstOrNull { it.id == id }
           ?: throw IllegalArgumentException("Unsupported key type")
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 e7f8c70e4f..9ec1e5b8fb 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
@@ -7,7 +7,6 @@ package com.flowcrypt.email.database.entity
 
 import android.content.ContentValues
 import android.content.Context
-import android.os.Parcel
 import android.os.Parcelable
 import android.provider.BaseColumns
 import androidx.preference.PreferenceManager
@@ -37,6 +36,8 @@ import jakarta.mail.MessagingException
 import jakarta.mail.Session
 import jakarta.mail.internet.AddressException
 import jakarta.mail.internet.InternetAddress
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 import java.util.Properties
 
 /**
@@ -53,6 +54,7 @@ import java.util.Properties
     Index(name = "email_uid_folder_in_messages", value = ["email", "uid", "folder"], unique = true)
   ]
 )
+@Parcelize
 data class MessageEntity(
   @PrimaryKey(autoGenerate = true) @ColumnInfo(name = BaseColumns._ID) val id: Long? = null,
   val email: String,
@@ -85,33 +87,43 @@ data class MessageEntity(
   @ColumnInfo(name = "draft_id", defaultValue = "NULL") val draftId: String? = null
 ) : Parcelable {
 
+  @IgnoredOnParcel
   @Ignore
   val from: List<InternetAddress> = EmailUtil.parseAddresses(fromAddress)
 
+  @IgnoredOnParcel
   @Ignore
   val replyToAddress: List<InternetAddress> = EmailUtil.parseAddresses(replyTo)
 
+  @IgnoredOnParcel
   @Ignore
   val to: List<InternetAddress> = EmailUtil.parseAddresses(toAddress)
 
+  @IgnoredOnParcel
   @Ignore
   val cc: List<InternetAddress> = EmailUtil.parseAddresses(ccAddress)
 
+  @IgnoredOnParcel
   @Ignore
   val msgState: MessageState = MessageState.generate(state ?: MessageState.NONE.value)
 
+  @IgnoredOnParcel
   @Ignore
   val isSeen: Boolean = flags?.contains(MessageFlag.SEEN.value) ?: false
 
+  @IgnoredOnParcel
   @Ignore
   val isDraft: Boolean = flags?.contains(MessageFlag.DRAFT.value) ?: false
 
+  @IgnoredOnParcel
   @Ignore
   val isOutboxMsg: Boolean = JavaEmailConstants.FOLDER_OUTBOX.equals(folder, ignoreCase = true)
 
+  @IgnoredOnParcel
   @Ignore
   val uidAsHEX: String = uid.toHex()
 
+  @IgnoredOnParcel
   @Ignore
   val isPasswordProtected = password?.isNotEmpty() ?: false
 
@@ -135,58 +147,6 @@ data class MessageEntity(
       return emails
     }
 
-  constructor(parcel: Parcel) : this(
-    parcel.readValue(Long::class.java.classLoader) as? Long,
-    parcel.readString() ?: "",
-    parcel.readString() ?: "",
-    parcel.readLong(),
-    parcel.readValue(Long::class.java.classLoader) as? Long,
-    parcel.readValue(Long::class.java.classLoader) as? Long,
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
-    parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
-    parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
-    parcel.readValue(Int::class.java.classLoader) as? Int,
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.createByteArray(),
-    parcel.readString()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeValue(id)
-    parcel.writeString(email)
-    parcel.writeString(folder)
-    parcel.writeLong(uid)
-    parcel.writeValue(receivedDate)
-    parcel.writeValue(sentDate)
-    parcel.writeString(fromAddress)
-    parcel.writeString(toAddress)
-    parcel.writeString(ccAddress)
-    parcel.writeString(subject)
-    parcel.writeString(this.flags)
-    parcel.writeString(rawMessageWithoutAttachments)
-    parcel.writeValue(hasAttachments)
-    parcel.writeValue(isEncrypted)
-    parcel.writeValue(isNew)
-    parcel.writeValue(state)
-    parcel.writeString(attachmentsDirectory)
-    parcel.writeString(errorMsg)
-    parcel.writeString(replyTo)
-    parcel.writeString(threadId)
-    parcel.writeString(historyId)
-    parcel.writeByteArray(password)
-    parcel.writeString(draftId)
-  }
-
   override fun describeContents(): Int {
     return 0
   }
@@ -274,17 +234,9 @@ data class MessageEntity(
     return result
   }
 
-  companion object CREATOR : Parcelable.Creator<MessageEntity> {
+  companion object {
     const val TABLE_NAME = "messages"
 
-    override fun createFromParcel(parcel: Parcel): MessageEntity {
-      return MessageEntity(parcel)
-    }
-
-    override fun newArray(size: Int): Array<MessageEntity?> {
-      return arrayOfNulls(size)
-    }
-
     fun genMessageEntities(
       context: Context, email: String, label: String, folder: IMAPFolder,
       msgs: Array<Message>?,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt
index baa3706277..0336b71acb 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt
@@ -51,6 +51,7 @@ import com.flowcrypt.email.security.model.PgpKeyDetails
     )
   ]
 )
+//@Parcelize
 data class PublicKeyEntity(
   @PrimaryKey(autoGenerate = true) @ColumnInfo(name = BaseColumns._ID) val id: Long? = null,
   @ColumnInfo(name = "recipient") val recipient: String,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt
index b974a1e25f..5b17540b5a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt
@@ -5,7 +5,6 @@
 
 package com.flowcrypt.email.database.entity
 
-import android.os.Parcel
 import android.os.Parcelable
 import android.provider.BaseColumns
 import androidx.room.ColumnInfo
@@ -13,6 +12,7 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import jakarta.mail.internet.InternetAddress
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -28,37 +28,14 @@ import jakarta.mail.internet.InternetAddress
     Index(name = "email_in_recipients", value = ["email"], unique = true)
   ]
 )
+@Parcelize
 data class RecipientEntity(
   @PrimaryKey(autoGenerate = true) @ColumnInfo(name = BaseColumns._ID) val id: Long? = null,
   val email: String,
   @ColumnInfo(defaultValue = "NULL") val name: String? = null,
   @ColumnInfo(name = "last_use", defaultValue = "0") val lastUse: Long = 0
 ) : Parcelable {
-
-  constructor(parcel: Parcel) : this(
-    parcel.readValue(Long::class.java.classLoader) as? Long,
-    requireNotNull(parcel.readString()),
-    parcel.readString(),
-    parcel.readLong()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeValue(id)
-    parcel.writeString(email)
-    parcel.writeString(name)
-    parcel.writeLong(lastUse)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
   fun toInternetAddress(): InternetAddress {
     return InternetAddress(email, name)
   }
-
-  companion object CREATOR : Parcelable.Creator<RecipientEntity> {
-    override fun createFromParcel(parcel: Parcel): RecipientEntity = RecipientEntity(parcel)
-    override fun newArray(size: Int): Array<RecipientEntity?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/relation/RecipientWithPubKeys.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/relation/RecipientWithPubKeys.kt
index 6c6327452e..6fe355e650 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/relation/RecipientWithPubKeys.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/relation/RecipientWithPubKeys.kt
@@ -5,13 +5,12 @@
 
 package com.flowcrypt.email.database.entity.relation
 
-import android.os.Parcel
 import android.os.Parcelable
 import androidx.room.Embedded
 import androidx.room.Relation
 import com.flowcrypt.email.database.entity.PublicKeyEntity
 import com.flowcrypt.email.database.entity.RecipientEntity
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -19,6 +18,7 @@ import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
  *         Time: 11:29 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class RecipientWithPubKeys(
   @Embedded val recipient: RecipientEntity,
   @Relation(
@@ -28,20 +28,6 @@ data class RecipientWithPubKeys(
   )
   val publicKeys: List<PublicKeyEntity>
 ) : Parcelable {
-  constructor(parcel: Parcel) : this(
-    requireNotNull(parcel.readParcelableViaExt(RecipientEntity::class.java)),
-    requireNotNull(parcel.createTypedArrayList(PublicKeyEntity))
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(recipient, flags)
-    parcel.writeTypedList(publicKeys)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
   fun hasAtLeastOnePubKey(): Boolean {
     return publicKeys.isNotEmpty()
   }
@@ -57,9 +43,4 @@ data class RecipientWithPubKeys(
   fun hasUsablePubKey(): Boolean {
     return publicKeys.any { (it.isNotUsable ?: false).not() }
   }
-
-  companion object CREATOR : Parcelable.Creator<RecipientWithPubKeys> {
-    override fun createFromParcel(parcel: Parcel) = RecipientWithPubKeys(parcel)
-    override fun newArray(size: Int): Array<RecipientWithPubKeys?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/model/DialogItem.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/model/DialogItem.kt
index 5eab3eb8d4..955409dbcf 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/model/DialogItem.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/model/DialogItem.kt
@@ -5,8 +5,8 @@
 
 package com.flowcrypt.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * Simple POJO class which describes a dialog item.
@@ -16,33 +16,9 @@ import android.os.Parcelable
  * Time: 11:29
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class DialogItem constructor(
   val iconResourceId: Int = 0,
   val title: String = "",
   val id: Int = 0
-) : Parcelable {
-  constructor(source: Parcel) : this(
-    source.readInt(),
-    source.readString()!!,
-    source.readInt()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeInt(iconResourceId)
-      writeString(title)
-      writeInt(id)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<DialogItem> = object : Parcelable.Creator<DialogItem> {
-      override fun createFromParcel(source: Parcel): DialogItem = DialogItem(source)
-      override fun newArray(size: Int): Array<DialogItem?> = arrayOfNulls(size)
-    }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportDetails.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportDetails.kt
index 7688fe1659..3cca189704 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportDetails.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportDetails.kt
@@ -10,6 +10,7 @@ import android.os.Parcelable
 import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.security.model.PrivateKeySourceType
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes a details about the key. The key can be one of three
@@ -25,6 +26,7 @@ import com.flowcrypt.email.security.model.PrivateKeySourceType
  * Time: 12:56
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class KeyImportDetails constructor(
   val keyName: String? = null,
   val value: String,
@@ -56,41 +58,13 @@ data class KeyImportDetails constructor(
     recipientWithPubKeys = null
   )
 
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeString(keyName)
-      writeString(value)
-      writeParcelable(sourceType, flags)
-      writeInt((if (isPrivateKey) 1 else 0))
-      writeParcelable(recipientWithPubKeys, flags)
-    }
-
   /**
    * The key available types.
    */
+  @Parcelize
   enum class SourceType : Parcelable {
     EMAIL, FILE, CLIPBOARD, NEW, MANUAL_ENTERING, EKM;
 
-    companion object {
-      @JvmField
-      val CREATOR: Parcelable.Creator<SourceType> = object : Parcelable.Creator<SourceType> {
-        override fun createFromParcel(source: Parcel): SourceType = values()[source.readInt()]
-        override fun newArray(size: Int): Array<SourceType?> = arrayOfNulls(size)
-      }
-    }
-
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
-
     fun toPrivateKeySourceTypeString(): String {
       return when (this) {
         EMAIL, EKM -> PrivateKeySourceType.BACKUP
@@ -99,9 +73,4 @@ data class KeyImportDetails constructor(
       }.toString()
     }
   }
-
-  companion object CREATOR : Parcelable.Creator<KeyImportDetails> {
-    override fun createFromParcel(parcel: Parcel): KeyImportDetails = KeyImportDetails(parcel)
-    override fun newArray(size: Int): Array<KeyImportDetails?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportModel.kt
index d6468f4842..9232e3f42f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/model/KeyImportModel.kt
@@ -6,9 +6,8 @@
 package com.flowcrypt.email.model
 
 import android.net.Uri
-import android.os.Parcel
 import android.os.Parcelable
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
+import kotlinx.parcelize.Parcelize
 
 /**
  * This model describes info about an imported key.
@@ -18,36 +17,10 @@ import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
  * Time: 15:47
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class KeyImportModel constructor(
   val fileUri: Uri? = null,
   val keyString: String? = null,
   val isPrivateKey: Boolean = false,
   val sourceType: KeyImportDetails.SourceType
-) : Parcelable {
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(Uri::class.java),
-    source.readString(),
-    source.readInt() == 1,
-    source.readParcelableViaExt(KeyImportDetails.SourceType::class.java)!!
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeParcelable(fileUri, flags)
-      writeString(keyString)
-      writeInt((if (isPrivateKey) 1 else 0))
-      writeParcelable(sourceType, flags)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<KeyImportModel> = object : Parcelable.Creator<KeyImportModel> {
-      override fun createFromParcel(source: Parcel): KeyImportModel = KeyImportModel(source)
-      override fun newArray(size: Int): Array<KeyImportModel?> = arrayOfNulls(size)
-    }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageEncryptionType.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageEncryptionType.kt
index 3a02d1b944..0a432e2eab 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageEncryptionType.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageEncryptionType.kt
@@ -5,8 +5,8 @@
 
 package com.flowcrypt.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * The message encryption type.
@@ -16,25 +16,7 @@ import android.os.Parcelable
  * Time: 15:41
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 enum class MessageEncryptionType : Parcelable {
   ENCRYPTED, STANDARD;
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    dest.writeInt(ordinal)
-  }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<MessageEncryptionType> =
-      object : Parcelable.Creator<MessageEncryptionType> {
-        override fun createFromParcel(source: Parcel): MessageEncryptionType =
-          values()[source.readInt()]
-
-        override fun newArray(size: Int): Array<MessageEncryptionType?> = arrayOfNulls(size)
-      }
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/model/Screenshot.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/model/Screenshot.kt
index dbc10a4967..1e8a6d34a4 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/model/Screenshot.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/model/Screenshot.kt
@@ -5,8 +5,8 @@
 
 package com.flowcrypt.email.model
 
-import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -14,9 +14,8 @@ import android.os.Parcelable
  *         Time: 2:23 PM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class Screenshot(val byteArray: ByteArray) : Parcelable {
-  constructor(parcel: Parcel) : this(parcel.createByteArray() ?: byteArrayOf())
-
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false
@@ -31,17 +30,4 @@ data class Screenshot(val byteArray: ByteArray) : Parcelable {
   override fun hashCode(): Int {
     return byteArray.contentHashCode()
   }
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeByteArray(byteArray)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<Screenshot> {
-    override fun createFromParcel(parcel: Parcel) = Screenshot(parcel)
-    override fun newArray(size: Int): Array<Screenshot?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/Algo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/Algo.kt
index 183abedb8f..c31e06e09d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/Algo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/Algo.kt
@@ -5,10 +5,9 @@
 
 package com.flowcrypt.email.security.model
 
-import android.os.Parcel
 import android.os.Parcelable
-
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -16,36 +15,10 @@ import com.google.gson.annotations.Expose
  * Time: 1:42 PM
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class Algo constructor(
   @Expose val algorithm: String?,
   @Expose val algorithmId: Int,
   @Expose val bits: Int,
   @Expose val curve: String?
-) : Parcelable {
-  constructor(source: Parcel) : this(
-    source.readString(),
-    source.readInt(),
-    source.readInt(),
-    source.readString()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeString(algorithm)
-      writeInt(algorithmId)
-      writeInt(bits)
-      writeString(curve)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<Algo> = object : Parcelable.Creator<Algo> {
-      override fun createFromParcel(source: Parcel): Algo = Algo(source)
-      override fun newArray(size: Int): Array<Algo?> = arrayOfNulls(size)
-    }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/KeyId.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/KeyId.kt
index 2831127ef4..014da6c847 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/KeyId.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/KeyId.kt
@@ -5,9 +5,9 @@
 
 package com.flowcrypt.email.security.model
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -15,26 +15,5 @@ import com.google.gson.annotations.Expose
  * Time: 1:38 PM
  * E-mail: DenBond7@gmail.com
  */
-data class KeyId constructor(@Expose val fingerprint: String) : Parcelable {
-  constructor(source: Parcel) : this(
-    source.readString()
-      ?: throw IllegalArgumentException("fingerprint can't be null")
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeString(fingerprint)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<KeyId> = object : Parcelable.Creator<KeyId> {
-      override fun createFromParcel(source: Parcel): KeyId = KeyId(source)
-      override fun newArray(size: Int): Array<KeyId?> = arrayOfNulls(size)
-    }
-  }
-}
+@Parcelize
+data class KeyId constructor(@Expose val fingerprint: String) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/PgpKeyDetails.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/PgpKeyDetails.kt
index c3a194468e..234eae2675 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/PgpKeyDetails.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/model/PgpKeyDetails.kt
@@ -7,7 +7,6 @@ package com.flowcrypt.email.security.model
 
 import android.content.Context
 import android.content.res.ColorStateList
-import android.os.Parcel
 import android.os.Parcelable
 import android.util.Patterns
 import androidx.core.content.ContextCompat
@@ -16,12 +15,12 @@ import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.KeyEntity
 import com.flowcrypt.email.database.entity.PublicKeyEntity
 import com.flowcrypt.email.database.entity.RecipientEntity
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.model.KeyImportDetails
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
 import jakarta.mail.internet.AddressException
 import jakarta.mail.internet.InternetAddress
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class collects base info of [org.bouncycastle.openpgp.PGPKeyRing]
@@ -32,6 +31,7 @@ import jakarta.mail.internet.InternetAddress
  * Time: 1:23 PM
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class PgpKeyDetails constructor(
   @Expose val isFullyDecrypted: Boolean,
   @Expose val isFullyEncrypted: Boolean,
@@ -66,46 +66,6 @@ data class PgpKeyDetails constructor(
       return !isFullyDecrypted && !isFullyEncrypted
     }
 
-  constructor(source: Parcel) : this(
-    source.readValue(Boolean::class.java.classLoader) as Boolean,
-    source.readValue(Boolean::class.java.classLoader) as Boolean,
-    source.readValue(Boolean::class.java.classLoader) as Boolean,
-    source.readValue(Boolean::class.java.classLoader) as Boolean,
-    source.readString(),
-    source.readString() ?: throw IllegalArgumentException("pubkey can't be null"),
-    source.createStringArrayList() ?: throw NullPointerException(),
-    source.createTypedArrayList(KeyId.CREATOR) ?: throw NullPointerException(),
-    source.readLong(),
-    source.readValue(Long::class.java.classLoader) as Long?,
-    source.readValue(Long::class.java.classLoader) as Long?,
-    source.readParcelableViaExt(Algo::class.java) ?: throw NullPointerException(),
-    source.readLong(),
-    source.createCharArray(),
-    source.readParcelableViaExt(KeyEntity.PassphraseType::class.java),
-    source.readParcelableViaExt(KeyImportDetails.SourceType::class.java)
-  )
-
-  override fun describeContents() = 0
-
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeValue(isFullyDecrypted)
-    writeValue(isFullyEncrypted)
-    writeValue(isRevoked)
-    writeValue(usableForEncryption)
-    writeString(privateKey)
-    writeString(publicKey)
-    writeStringList(users)
-    writeTypedList(ids)
-    writeLong(created)
-    writeValue(lastModified)
-    writeValue(expiration)
-    writeParcelable(algo, flags)
-    writeLong(primaryKeyId)
-    writeCharArray(tempPassphrase)
-    writeParcelable(passphraseType, flags)
-    writeParcelable(importSourceType, flags)
-  }
-
   fun getUserIdsAsSingleString(): String {
     return mimeAddresses.joinToString { it.address }
   }
@@ -242,9 +202,4 @@ data class PgpKeyDetails constructor(
     result = 31 * result + (passphraseType?.hashCode() ?: 0)
     return result
   }
-
-  companion object CREATOR : Parcelable.Creator<PgpKeyDetails> {
-    override fun createFromParcel(parcel: Parcel): PgpKeyDetails = PgpKeyDetails(parcel)
-    override fun newArray(size: Int): Array<PgpKeyDetails?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecryptAndOrVerify.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecryptAndOrVerify.kt
index 18ea8902e0..0dafac683e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecryptAndOrVerify.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpDecryptAndOrVerify.kt
@@ -5,9 +5,9 @@
 
 package com.flowcrypt.email.security.pgp
 
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.util.exception.DecryptionException
+import kotlinx.parcelize.Parcelize
 import org.bouncycastle.openpgp.PGPDataValidationException
 import org.bouncycastle.openpgp.PGPException
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection
@@ -193,6 +193,7 @@ object PgpDecryptAndOrVerify {
     }
   }
 
+  @Parcelize
   enum class DecryptionErrorType : Parcelable {
     KEY_MISMATCH,
     WRONG_PASSPHRASE,
@@ -201,18 +202,5 @@ object PgpDecryptAndOrVerify {
     NEED_PASSPHRASE,
     FORMAT,
     OTHER;
-
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
-
-    companion object CREATOR : Parcelable.Creator<DecryptionErrorType> {
-      override fun createFromParcel(parcel: Parcel) = values()[parcel.readInt()]
-      override fun newArray(size: Int): Array<DecryptionErrorType?> = arrayOfNulls(size)
-    }
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt
index 534a68ac4d..afa3e10cba 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt
@@ -8,6 +8,7 @@ package com.flowcrypt.email.service.actionqueue.actions
 import android.content.Context
 import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * Must be run in non-UI thread. This class describes an action which will be run on a queue.
@@ -28,27 +29,14 @@ interface Action : Parcelable {
   /**
    * This class contains information about all action types.
    */
+  @Parcelize
   enum class Type constructor(val value: String) : Parcelable {
     NONE("none"),
     BACKUP_PRIVATE_KEY_TO_INBOX("backup_private_key_to_inbox"),
     ENCRYPT_PRIVATE_KEYS("encrypt_private_keys"),
     LOAD_GMAIL_ALIASES("load_gmail_aliases");
 
-    override fun describeContents(): Int {
-      return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-      dest.writeInt(ordinal)
-    }
-
     companion object {
-      @JvmField
-      val CREATOR: Parcelable.Creator<Type> = object : Parcelable.Creator<Type> {
-        override fun createFromParcel(source: Parcel): Type = values()[source.readInt()]
-        override fun newArray(size: Int): Array<Type?> = arrayOfNulls(size)
-      }
-
       @JvmStatic
       fun generate(code: String): Type? {
         for (messageState in values()) {
@@ -66,6 +54,7 @@ interface Action : Parcelable {
     const val TAG_NAME_ACTION_TYPE = "actionType"
   }
 
+  //@Parcelize
   data class None(override var id: Long = 0) : Action {
     override val email: String? = null
     override val version: Int = 0

From a51c0e34a8e0fbb943dfd3cc8e3b135f9844cf2c Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Mon, 7 Nov 2022 18:48:42 +0200
Subject: [PATCH 2/4] Applied "kotlin-parcelize" plugin. Step 2.| #1034

---
 .../api/ClientConfigurationResponse.kt        | 28 ++---------
 .../response/api/DomainOrgRulesResponse.kt    | 28 ++---------
 .../response/api/FesServerResponse.kt         | 36 ++------------
 .../response/api/LinkMessageResponse.kt       | 42 ++--------------
 .../response/api/MessageReplyResponse.kt      | 35 ++------------
 .../response/api/MessageReplyTokenResponse.kt | 26 ++--------
 .../response/api/MessageUploadResponse.kt     | 26 ++--------
 .../response/api/PostHelpFeedbackResponse.kt  | 35 ++------------
 .../retrofit/response/attester/PubResponse.kt | 30 ++----------
 .../response/attester/SubmitPubKeyResponse.kt | 30 ++----------
 .../attester/WelcomeMessageResponse.kt        | 30 ++----------
 .../api/retrofit/response/base/ApiError.kt    | 33 ++-----------
 .../response/model/DecryptErrorMsgBlock.kt    |  1 +
 .../DecryptedAndOrSignedContentMsgBlock.kt    | 31 +++---------
 .../response/model/DecryptedAttMsgBlock.kt    |  1 +
 .../model/EncryptedAttLinkMsgBlock.kt         | 29 ++---------
 .../response/model/EncryptedAttMsgBlock.kt    |  1 +
 .../response/model/GenericMsgBlock.kt         |  1 +
 .../retrofit/response/model/MsgBlockError.kt  |  4 +-
 .../response/model/PlainAttMsgBlock.kt        |  1 +
 .../response/model/PublicKeyMsgBlock.kt       |  3 +-
 .../retrofit/response/model/SignedMsgBlock.kt |  1 +
 .../oauth2/MicrosoftOAuth2TokenResponse.kt    | 48 +------------------
 .../actions/BackupPrivateKeyToInboxAction.kt  |  1 +
 .../EncryptPrivateKeysIfNeededAction.kt       |  1 +
 .../actions/LoadGmailAliasesAction.kt         |  1 +
 26 files changed, 60 insertions(+), 443 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/ClientConfigurationResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/ClientConfigurationResponse.kt
index d878e6a093..e00acbeee2 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/ClientConfigurationResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/ClientConfigurationResponse.kt
@@ -5,14 +5,12 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
 import com.flowcrypt.email.api.retrofit.response.model.OrgRules
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -20,30 +18,10 @@ import com.google.gson.annotations.SerializedName
  *         Time: 4:16 PM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class ClientConfigurationResponse constructor(
   @SerializedName("error")
   @Expose override val apiError: ApiError? = null,
   @SerializedName("clientConfiguration")
   @Expose val orgRules: OrgRules?
-) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readParcelableViaExt(ApiError::class.java),
-    parcel.readParcelableViaExt(OrgRules::class.java)
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    with(parcel) {
-      writeParcelable(apiError, flags)
-      writeParcelable(orgRules, flags)
-    }
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<ClientConfigurationResponse> {
-    override fun createFromParcel(parcel: Parcel) = ClientConfigurationResponse(parcel)
-    override fun newArray(size: Int): Array<ClientConfigurationResponse?> = arrayOfNulls(size)
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/DomainOrgRulesResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/DomainOrgRulesResponse.kt
index 7a524d150b..a6e954a4e5 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/DomainOrgRulesResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/DomainOrgRulesResponse.kt
@@ -5,14 +5,12 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
 import com.flowcrypt.email.api.retrofit.response.model.OrgRules
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes a response from the https://flowcrypt.com/api/account/get API.
@@ -22,30 +20,10 @@ import com.google.gson.annotations.SerializedName
  *         Time: 11:25 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class DomainOrgRulesResponse constructor(
   @SerializedName("error")
   @Expose override val apiError: ApiError? = null,
   @SerializedName("domain_org_rules")
   @Expose val orgRules: OrgRules?
-) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readParcelableViaExt(ApiError::class.java),
-    parcel.readParcelableViaExt(OrgRules::class.java)
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    with(parcel) {
-      writeParcelable(apiError, flags)
-      writeParcelable(orgRules, flags)
-    }
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<DomainOrgRulesResponse> {
-    override fun createFromParcel(parcel: Parcel) = DomainOrgRulesResponse(parcel)
-    override fun newArray(size: Int): Array<DomainOrgRulesResponse?> = arrayOfNulls(size)
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/FesServerResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/FesServerResponse.kt
index e1aad01b78..584680c0e6 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/FesServerResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/FesServerResponse.kt
@@ -5,13 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -19,6 +17,7 @@ import com.google.gson.annotations.SerializedName
  *         Time: 8:52 AM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class FesServerResponse constructor(
   @SerializedName("error")
   @Expose override val apiError: ApiError? = null,
@@ -28,33 +27,4 @@ data class FesServerResponse constructor(
   @Expose val version: String?,
   @Expose val endUserApiVersion: String?,
   @Expose val adminApiVersion: String?,
-) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readParcelableViaExt(ApiError::class.java),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(apiError, flags)
-    parcel.writeString(vendor)
-    parcel.writeString(service)
-    parcel.writeString(orgId)
-    parcel.writeString(version)
-    parcel.writeString(endUserApiVersion)
-    parcel.writeString(adminApiVersion)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<FesServerResponse> {
-    override fun createFromParcel(parcel: Parcel): FesServerResponse = FesServerResponse(parcel)
-    override fun newArray(size: Int): Array<FesServerResponse?> = arrayOfNulls(size)
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/LinkMessageResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/LinkMessageResponse.kt
index b20f8f852b..d009251b7a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/LinkMessageResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/LinkMessageResponse.kt
@@ -5,14 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
-
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes a response from the https://flowcrypt.com/api/link/message API.
@@ -29,6 +26,7 @@ import com.google.gson.annotations.SerializedName
  * Time: 15:16
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class LinkMessageResponse constructor(
   @SerializedName("error") @Expose override val apiError: ApiError?,
   @Expose val url: String?,
@@ -36,38 +34,4 @@ data class LinkMessageResponse constructor(
   @Expose val expire: String?,
   @Expose val isExpired: Boolean,
   @Expose val repliable: Boolean?
-) : ApiResponse {
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(ApiError::class.java),
-    source.readString(),
-    1 == source.readInt(),
-    source.readString(),
-    1 == source.readInt(),
-    source.readValue(Boolean::class.java.classLoader) as Boolean?
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeParcelable(apiError, 0)
-      writeString(url)
-      writeInt((if (isDeleted) 1 else 0))
-      writeString(expire)
-      writeInt((if (isExpired) 1 else 0))
-      writeValue(repliable)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<LinkMessageResponse> =
-      object : Parcelable.Creator<LinkMessageResponse> {
-        override fun createFromParcel(source: Parcel): LinkMessageResponse =
-          LinkMessageResponse(source)
-
-        override fun newArray(size: Int): Array<LinkMessageResponse?> = arrayOfNulls(size)
-      }
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyResponse.kt
index 74dd5f087f..acfdcb20e0 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyResponse.kt
@@ -5,14 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
-
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes a response from the https://flowcrypt.com/api/message/reply API.
@@ -29,34 +26,8 @@ import com.google.gson.annotations.SerializedName
  * Time: 16:33
  * E-mail: DenBond7@gmail.com
  */
-
+@Parcelize
 data class MessageReplyResponse constructor(
   @SerializedName("error") @Expose override val apiError: ApiError?,
   @Expose val isSent: Boolean
-) : ApiResponse {
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(ApiError::class.java),
-    1 == source.readInt()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeParcelable(apiError, 0)
-      writeInt((if (isSent) 1 else 0))
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<MessageReplyResponse> =
-      object : Parcelable.Creator<MessageReplyResponse> {
-        override fun createFromParcel(source: Parcel): MessageReplyResponse =
-          MessageReplyResponse(source)
-
-        override fun newArray(size: Int): Array<MessageReplyResponse?> = arrayOfNulls(size)
-      }
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyTokenResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyTokenResponse.kt
index 24d9f3a819..336077926f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyTokenResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageReplyTokenResponse.kt
@@ -5,13 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -19,27 +17,9 @@ import com.google.gson.annotations.SerializedName
  *         Time: 12:10 PM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class MessageReplyTokenResponse(
   @SerializedName("error")
   @Expose override val apiError: ApiError? = null,
   @Expose val replyToken: String? = null
-) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readParcelableViaExt(ApiError::class.java),
-    parcel.readString()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(apiError, flags)
-    parcel.writeString(replyToken)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<MessageReplyTokenResponse> {
-    override fun createFromParcel(parcel: Parcel) = MessageReplyTokenResponse(parcel)
-    override fun newArray(size: Int): Array<MessageReplyTokenResponse?> = arrayOfNulls(size)
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageUploadResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageUploadResponse.kt
index bea0f1433b..b1e14228ab 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageUploadResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/MessageUploadResponse.kt
@@ -5,13 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -19,27 +17,9 @@ import com.google.gson.annotations.SerializedName
  *         Time: 12:34 PM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class MessageUploadResponse(
   @SerializedName("error")
   @Expose override val apiError: ApiError? = null,
   @Expose val url: String? = null
-) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readParcelableViaExt(ApiError::class.java),
-    parcel.readString()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(apiError, flags)
-    parcel.writeString(url)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<MessageUploadResponse> {
-    override fun createFromParcel(parcel: Parcel) = MessageUploadResponse(parcel)
-    override fun newArray(size: Int): Array<MessageUploadResponse?> = arrayOfNulls(size)
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/PostHelpFeedbackResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/PostHelpFeedbackResponse.kt
index 0bedd67be0..8eb6ee2a02 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/PostHelpFeedbackResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/PostHelpFeedbackResponse.kt
@@ -5,14 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.api
 
-import android.os.Parcel
-import android.os.Parcelable
-
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * The simple POJO object, which contains information about a post feedback result.
@@ -35,35 +32,9 @@ import com.google.gson.annotations.SerializedName
  * Time: 12:34
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class PostHelpFeedbackResponse constructor(
   @SerializedName("error") @Expose override val apiError: ApiError? = null,
   @SerializedName("sent") @Expose val isSent: Boolean? = null,
   @Expose val text: String? = null
-) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readParcelableViaExt(ApiError::class.java),
-    parcel.readValue(Boolean::class.java.classLoader) as? Boolean,
-    parcel.readString()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(apiError, flags)
-    parcel.writeValue(isSent)
-    parcel.writeString(text)
-  }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<PostHelpFeedbackResponse> =
-      object : Parcelable.Creator<PostHelpFeedbackResponse> {
-        override fun createFromParcel(source: Parcel): PostHelpFeedbackResponse =
-          PostHelpFeedbackResponse(source)
-
-        override fun newArray(size: Int): Array<PostHelpFeedbackResponse?> = arrayOfNulls(size)
-      }
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/PubResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/PubResponse.kt
index 679d50e52d..a4989eac7f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/PubResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/PubResponse.kt
@@ -5,13 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.attester
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * Response from the API
@@ -22,31 +20,9 @@ import com.google.gson.annotations.SerializedName
  * Time: 14:01
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class PubResponse constructor(
   @SerializedName("error")
   @Expose override val apiError: ApiError? = null,
   @Expose val pubkey: String?
-) : ApiResponse {
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(ApiError::class.java),
-    source.readString()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeParcelable(apiError, 0)
-      writeString(pubkey)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<PubResponse> = object : Parcelable.Creator<PubResponse> {
-      override fun createFromParcel(source: Parcel): PubResponse = PubResponse(source)
-      override fun newArray(size: Int): Array<PubResponse?> = arrayOfNulls(size)
-    }
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/SubmitPubKeyResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/SubmitPubKeyResponse.kt
index 79fe1aab5c..311481c3d9 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/SubmitPubKeyResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/SubmitPubKeyResponse.kt
@@ -5,14 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.attester
 
-import android.os.Parcel
-import android.os.Parcelable
-
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes a response from the https://flowcrypt.com/attester/pub API.
@@ -22,29 +19,8 @@ import com.google.gson.annotations.SerializedName
  * Time: 16:30
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class SubmitPubKeyResponse constructor(
   @SerializedName("error") @Expose override val
   apiError: ApiError? = null
-) : ApiResponse {
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(ApiError::class.java)
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeParcelable(apiError, 0)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<SubmitPubKeyResponse> =
-      object : Parcelable.Creator<SubmitPubKeyResponse> {
-        override fun createFromParcel(source: Parcel) = SubmitPubKeyResponse(source)
-        override fun newArray(size: Int): Array<SubmitPubKeyResponse?> = arrayOfNulls(size)
-      }
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/WelcomeMessageResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/WelcomeMessageResponse.kt
index 5a56325626..d85f352c4a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/WelcomeMessageResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/attester/WelcomeMessageResponse.kt
@@ -5,14 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.attester
 
-import android.os.Parcel
-import android.os.Parcelable
-
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class describes a response from the https://flowcrypt.com/attester/test/welcome API.
@@ -29,28 +26,7 @@ import com.google.gson.annotations.SerializedName
  * Time: 14:38
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class WelcomeMessageResponse constructor(
   @SerializedName("error") @Expose override val apiError: ApiError?
-) : ApiResponse {
-
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(ApiError::class.java)
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeParcelable(apiError, 0)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR = object : Parcelable.Creator<WelcomeMessageResponse> {
-      override fun createFromParcel(source: Parcel) = WelcomeMessageResponse(source)
-      override fun newArray(size: Int): Array<WelcomeMessageResponse?> = arrayOfNulls(size)
-    }
-  }
-}
+) : ApiResponse
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/ApiError.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/ApiError.kt
index 5029aa7ca7..5d471f2afb 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/ApiError.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/ApiError.kt
@@ -5,12 +5,10 @@
 
 package com.flowcrypt.email.api.retrofit.response.base
 
-import android.os.Parcel
 import android.os.Parcelable
-
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
-import java.io.Serializable
+import kotlinx.parcelize.Parcelize
 
 /**
  * This POJO object describes a base error from the API.
@@ -20,36 +18,11 @@ import java.io.Serializable
  * Time: 9:26
  * E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class ApiError constructor(
   @Expose val code: Int? = null,
   @SerializedName("message") @Expose val msg: String? = null,
   @Expose val internal: String? = null,
   @Expose val stack: String? = null,
   @Expose val type: String? = null
-) : Parcelable, Serializable {
-  constructor(source: Parcel) : this(
-    source.readValue(Int::class.java.classLoader) as Int?,
-    source.readString(),
-    source.readString(),
-    source.readString(),
-    source.readString()
-  )
-
-  override fun describeContents() = 0
-
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeValue(code)
-    writeString(msg)
-    writeString(internal)
-    writeString(stack)
-    writeString(type)
-  }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<ApiError> = object : Parcelable.Creator<ApiError> {
-      override fun createFromParcel(source: Parcel): ApiError = ApiError(source)
-      override fun newArray(size: Int): Array<ApiError?> = arrayOfNulls(size)
-    }
-  }
-}
+) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt
index a7eee3ae12..2a8513941a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt
@@ -17,6 +17,7 @@ import com.google.gson.annotations.SerializedName
  * Time: 3:02 PM
  * E-mail: DenBond7@gmail.com
  */
+//@Parcelize
 data class DecryptErrorMsgBlock(
   @Expose override val content: String?,
   @SerializedName("decryptErr") @Expose val decryptErr: DecryptError?,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAndOrSignedContentMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAndOrSignedContentMsgBlock.kt
index 73c5771eef..32eaea68bb 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAndOrSignedContentMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAndOrSignedContentMsgBlock.kt
@@ -5,10 +5,9 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
-import android.os.Parcelable
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 import org.pgpainless.decryption_verification.OpenPgpMetadata
 
 /**
@@ -17,38 +16,20 @@ import org.pgpainless.decryption_verification.OpenPgpMetadata
  *         Time: 6:55 PM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class DecryptedAndOrSignedContentMsgBlock(
   @Expose override val error: MsgBlockError? = null,
   @Expose val blocks: List<MsgBlock> = listOf(),
   @Expose override val isOpenPGPMimeSigned: Boolean
 ) : MsgBlock {
+  @IgnoredOnParcel
   @Expose
   override val content: String? = null
 
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.DECRYPTED_AND_OR_SIGNED_CONTENT
 
+  @IgnoredOnParcel
   var openPgpMetadata: OpenPgpMetadata? = null
-
-  constructor(parcel: Parcel) : this(
-    parcel.readParcelableViaExt(MsgBlockError::class.java),
-    mutableListOf<MsgBlock>().apply { parcel.readTypedList(this, GenericMsgBlock.CREATOR) },
-    1 == parcel.readInt()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(error, flags)
-    parcel.writeList(blocks)
-    parcel.writeInt(if (isOpenPGPMimeSigned) 1 else 0)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<DecryptedAndOrSignedContentMsgBlock> {
-    override fun createFromParcel(parcel: Parcel) = DecryptedAndOrSignedContentMsgBlock(parcel)
-    override fun newArray(size: Int): Array<DecryptedAndOrSignedContentMsgBlock?> =
-      arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt
index 3742b2c41f..e61d86ac23 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt
@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName
  *         Time: 10:12 AM
  *         E-mail: DenBond7@gmail.com
  */
+//@Parcelize
 data class DecryptedAttMsgBlock(
   @Expose override val content: String?,
   @Expose override val attMeta: AttMeta,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttLinkMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttLinkMsgBlock.kt
index 36d49f8c0b..a1fb2facc0 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttLinkMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttLinkMsgBlock.kt
@@ -6,41 +6,22 @@
 
 package com.flowcrypt.email.api.retrofit.response.model
 
-import android.os.Parcel
-import android.os.Parcelable
-import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
+@Parcelize
 data class EncryptedAttLinkMsgBlock(
   @Expose override val attMeta: AttMeta,
   @Expose override val error: MsgBlockError? = null,
   @Expose override val isOpenPGPMimeSigned: Boolean
 ) : AttMsgBlock {
 
+  @IgnoredOnParcel
   @Expose
   override val content: String = ""
 
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.ENCRYPTED_ATT_LINK
-
-  constructor(source: Parcel) : this(
-    source.readParcelableViaExt(AttMeta::class.java)!!,
-    source.readParcelableViaExt(MsgBlockError::class.java),
-    1 == source.readInt()
-  )
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(attMeta, flags)
-    parcel.writeParcelable(error, flags)
-    parcel.writeInt(if (isOpenPGPMimeSigned) 1 else 0)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<EncryptedAttLinkMsgBlock> {
-    override fun createFromParcel(parcel: Parcel) = EncryptedAttLinkMsgBlock(parcel)
-    override fun newArray(size: Int): Array<EncryptedAttLinkMsgBlock?> = arrayOfNulls(size)
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt
index 0f54e7a3fc..a13a89c10a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt
@@ -12,6 +12,7 @@ import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 
+//@Parcelize
 data class EncryptedAttMsgBlock(
   @Expose override val content: String?,
   @Expose override val attMeta: AttMeta,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt
index 5018f165c9..f7dad6de0f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt
@@ -21,6 +21,7 @@ import com.google.gson.annotations.Expose
  *
  * @author Ivan Pizhenko
  */
+//@Parcelize
 data class GenericMsgBlock(
   @Expose override val type: MsgBlock.Type = MsgBlock.Type.UNKNOWN,
   @Expose override val content: String?,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt
index d73b64c6f9..70f77d539d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/MsgBlockError.kt
@@ -16,6 +16,4 @@ import kotlinx.parcelize.Parcelize
  *         E-mail: DenBond7@gmail.com
  */
 @Parcelize
-data class MsgBlockError(
-  @Expose val errorMsg: String? = null
-) : Parcelable
+data class MsgBlockError(@Expose val errorMsg: String? = null) : Parcelable
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt
index 46f41547b3..2bf891dc46 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt
@@ -12,6 +12,7 @@ import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 
+//@Parcelize
 data class PlainAttMsgBlock(
   @Expose override val content: String?,
   @Expose override val attMeta: AttMeta,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt
index dbdbdf6ff4..3374a4ccc1 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt
@@ -9,9 +9,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
-
 import com.flowcrypt.email.security.model.PgpKeyDetails
-
 import com.google.gson.annotations.Expose
 
 /**
@@ -22,6 +20,7 @@ import com.google.gson.annotations.Expose
  * Time: 2:35 PM
  * E-mail: DenBond7@gmail.com
  */
+//@Parcelize
 data class PublicKeyMsgBlock constructor(
   @Expose override val content: String?,
   @Expose val keyDetails: PgpKeyDetails? = null,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt
index 7c8c35734f..64f23cb81a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt
@@ -15,6 +15,7 @@ import org.pgpainless.decryption_verification.OpenPgpMetadata
 /**
  * Message block which represents content with a signature.
  */
+//@Parcelize
 data class SignedMsgBlock(
   @Expose override val content: String?,
   @Expose val signature: String? = null,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/oauth2/MicrosoftOAuth2TokenResponse.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/oauth2/MicrosoftOAuth2TokenResponse.kt
index fdcf860bbe..edd4c2f9c6 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/oauth2/MicrosoftOAuth2TokenResponse.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/oauth2/MicrosoftOAuth2TokenResponse.kt
@@ -5,12 +5,11 @@
 
 package com.flowcrypt.email.api.retrofit.response.oauth2
 
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.retrofit.response.base.ApiError
 import com.flowcrypt.email.api.retrofit.response.base.ApiResponse
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -18,6 +17,7 @@ import com.google.gson.annotations.SerializedName
  *         Time: 2:52 PM
  *         E-mail: DenBond7@gmail.com
  */
+@Parcelize
 data class MicrosoftOAuth2TokenResponse constructor(
   @SerializedName("access_token") @Expose val accessToken: String? = null,
   @SerializedName("token_type") @Expose val tokenType: String? = null,
@@ -32,21 +32,6 @@ data class MicrosoftOAuth2TokenResponse constructor(
   @SerializedName("trace_id") @Expose val traceId: String? = null,
   @SerializedName("correlation_id") @Expose val correlationId: String? = null
 ) : ApiResponse {
-  constructor(parcel: Parcel) : this(
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readValue(Long::class.java.classLoader) as? Long,
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.createIntArray(),
-    parcel.readString(),
-    parcel.readString(),
-    parcel.readString()
-  )
-
   override val apiError: ApiError?
     get() = if (error != null) {
       ApiError(
@@ -56,25 +41,6 @@ data class MicrosoftOAuth2TokenResponse constructor(
       )
     } else null
 
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeString(accessToken)
-    parcel.writeString(tokenType)
-    parcel.writeValue(expiresIn)
-    parcel.writeString(scope)
-    parcel.writeString(refreshToken)
-    parcel.writeString(idToken)
-    parcel.writeString(error)
-    parcel.writeString(errorDescription)
-    parcel.writeIntArray(errorCodes)
-    parcel.writeString(timestamp)
-    parcel.writeString(traceId)
-    parcel.writeString(correlationId)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false
@@ -117,14 +83,4 @@ data class MicrosoftOAuth2TokenResponse constructor(
     result = 31 * result + (apiError?.hashCode() ?: 0)
     return result
   }
-
-  companion object CREATOR : Parcelable.Creator<MicrosoftOAuth2TokenResponse> {
-    override fun createFromParcel(parcel: Parcel): MicrosoftOAuth2TokenResponse {
-      return MicrosoftOAuth2TokenResponse(parcel)
-    }
-
-    override fun newArray(size: Int): Array<MicrosoftOAuth2TokenResponse?> {
-      return arrayOfNulls(size)
-    }
-  }
 }
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 cd38c2d99a..01c0b8093b 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
@@ -28,6 +28,7 @@ import com.google.gson.annotations.SerializedName
  * Time: 16:58
  * E-mail: DenBond7@gmail.com
  */
+//@Parcelize
 data class BackupPrivateKeyToInboxAction @JvmOverloads constructor(
   override var id: Long = 0,
   override var email: String,
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 e790452d29..b5da06b4cd 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
@@ -34,6 +34,7 @@ import com.google.gson.annotations.SerializedName
  * Time: 4:03 PM
  * E-mail: DenBond7@gmail.com
  */
+//@Parcelize
 data class EncryptPrivateKeysIfNeededAction @JvmOverloads constructor(
   override var id: Long = 0,
   override var email: String? = null,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt
index 8d33887391..c34a9ca03f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt
@@ -24,6 +24,7 @@ import com.google.gson.annotations.SerializedName
  *         Time: 12:09 PM
  *         E-mail: DenBond7@gmail.com
  */
+//@Parcelize
 data class LoadGmailAliasesAction(
   override var id: Long = 0,
   override val email: String? = null,

From ba9e9ce5e3bd09180786d59915685d43b46167ee Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Tue, 8 Nov 2022 18:01:22 +0200
Subject: [PATCH 3/4] Applied "kotlin-parcelize" plugin. Step 3.| #1034

---
 .../response/model/DecryptErrorMsgBlock.kt    | 31 ++++++++--------
 .../response/model/DecryptedAttMsgBlock.kt    | 19 +++++-----
 .../response/model/EncryptedAttMsgBlock.kt    | 19 +++++-----
 .../response/model/GenericMsgBlock.kt         | 26 +++++++-------
 .../response/model/PlainAttMsgBlock.kt        | 19 +++++-----
 .../response/model/PublicKeyMsgBlock.kt       | 33 +++++++++--------
 .../retrofit/response/model/SignedMsgBlock.kt | 33 ++++++++---------
 .../email/database/entity/PublicKeyEntity.kt  | 31 ++++++++--------
 .../service/actionqueue/actions/Action.kt     | 24 ++++---------
 .../actions/BackupPrivateKeyToInboxAction.kt  | 33 +++--------------
 .../EncryptPrivateKeysIfNeededAction.kt       | 36 +++----------------
 .../actions/LoadGmailAliasesAction.kt         | 32 +++--------------
 12 files changed, 115 insertions(+), 221 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt
index 2a8513941a..96ee2ed993 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptErrorMsgBlock.kt
@@ -6,10 +6,12 @@
 package com.flowcrypt.email.api.retrofit.response.model
 
 import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -17,7 +19,7 @@ import com.google.gson.annotations.SerializedName
  * Time: 3:02 PM
  * E-mail: DenBond7@gmail.com
  */
-//@Parcelize
+@Parcelize
 data class DecryptErrorMsgBlock(
   @Expose override val content: String?,
   @SerializedName("decryptErr") @Expose val decryptErr: DecryptError?,
@@ -25,6 +27,7 @@ data class DecryptErrorMsgBlock(
   @Expose override val isOpenPGPMimeSigned: Boolean
 ) : MsgBlock {
 
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.DECRYPT_ERROR
 
@@ -35,24 +38,18 @@ data class DecryptErrorMsgBlock(
     1 == source.readInt()
   )
 
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeParcelable(type, flags)
-    parcel.writeString(content)
-    parcel.writeParcelable(decryptErr, flags)
-    parcel.writeParcelable(error, flags)
-    parcel.writeInt(if (isOpenPGPMimeSigned) 1 else 0)
-  }
+  companion object : Parceler<DecryptErrorMsgBlock> {
+    override fun DecryptErrorMsgBlock.write(parcel: Parcel, flags: Int) {
+      parcel.writeParcelable(type, flags)
+      parcel.writeString(content)
+      parcel.writeParcelable(decryptErr, flags)
+      parcel.writeParcelable(error, flags)
+      parcel.writeInt(if (isOpenPGPMimeSigned) 1 else 0)
+    }
 
-  companion object CREATOR : Parcelable.Creator<DecryptErrorMsgBlock> {
-    override fun createFromParcel(parcel: Parcel): DecryptErrorMsgBlock {
+    override fun create(parcel: Parcel): DecryptErrorMsgBlock {
       parcel.readParcelableViaExt(MsgBlock.Type::class.java)
       return DecryptErrorMsgBlock(parcel)
     }
-
-    override fun newArray(size: Int): Array<DecryptErrorMsgBlock?> = arrayOfNulls(size)
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt
index e61d86ac23..4c6d27d06a 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/DecryptedAttMsgBlock.kt
@@ -7,10 +7,12 @@ package com.flowcrypt.email.api.retrofit.response.model
 
 import android.net.Uri
 import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -18,7 +20,7 @@ import com.google.gson.annotations.SerializedName
  *         Time: 10:12 AM
  *         E-mail: DenBond7@gmail.com
  */
-//@Parcelize
+@Parcelize
 data class DecryptedAttMsgBlock(
   @Expose override val content: String?,
   @Expose override val attMeta: AttMeta,
@@ -29,6 +31,7 @@ data class DecryptedAttMsgBlock(
 
   var fileUri: Uri? = null
 
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.DECRYPTED_ATT
 
@@ -42,12 +45,9 @@ data class DecryptedAttMsgBlock(
     fileUri = source.readParcelableViaExt(Uri::class.java)
   }
 
-  override fun describeContents(): Int {
-    return 0
-  }
+  companion object : Parceler<DecryptedAttMsgBlock> {
 
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
+    override fun DecryptedAttMsgBlock.write(parcel: Parcel, flags: Int) = with(parcel) {
       writeParcelable(type, flags)
       writeString(content)
       writeParcelable(attMeta, flags)
@@ -57,12 +57,9 @@ data class DecryptedAttMsgBlock(
       writeParcelable(fileUri, flags)
     }
 
-  companion object CREATOR : Parcelable.Creator<DecryptedAttMsgBlock> {
-    override fun createFromParcel(parcel: Parcel): DecryptedAttMsgBlock {
+    override fun create(parcel: Parcel): DecryptedAttMsgBlock {
       parcel.readParcelableViaExt(MsgBlock.Type::class.java)
       return DecryptedAttMsgBlock(parcel)
     }
-
-    override fun newArray(size: Int): Array<DecryptedAttMsgBlock?> = arrayOfNulls(size)
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt
index a13a89c10a..8691702efb 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/EncryptedAttMsgBlock.kt
@@ -8,11 +8,13 @@ package com.flowcrypt.email.api.retrofit.response.model
 
 import android.net.Uri
 import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 
-//@Parcelize
+@Parcelize
 data class EncryptedAttMsgBlock(
   @Expose override val content: String?,
   @Expose override val attMeta: AttMeta,
@@ -22,6 +24,7 @@ data class EncryptedAttMsgBlock(
 
   var fileUri: Uri? = null
 
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.ENCRYPTED_ATT
 
@@ -34,12 +37,9 @@ data class EncryptedAttMsgBlock(
     fileUri = source.readParcelableViaExt(Uri::class.java)
   }
 
-  override fun describeContents(): Int {
-    return 0
-  }
+  companion object : Parceler<EncryptedAttMsgBlock> {
 
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
+    override fun EncryptedAttMsgBlock.write(parcel: Parcel, flags: Int) = with(parcel) {
       writeParcelable(type, flags)
       writeString(content)
       writeParcelable(attMeta, flags)
@@ -48,12 +48,9 @@ data class EncryptedAttMsgBlock(
       writeParcelable(fileUri, flags)
     }
 
-  companion object CREATOR : Parcelable.Creator<EncryptedAttMsgBlock> {
-    override fun createFromParcel(parcel: Parcel): EncryptedAttMsgBlock {
+    override fun create(parcel: Parcel): EncryptedAttMsgBlock {
       parcel.readParcelableViaExt(MsgBlock.Type::class.java)
       return EncryptedAttMsgBlock(parcel)
     }
-
-    override fun newArray(size: Int): Array<EncryptedAttMsgBlock?> = arrayOfNulls(size)
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt
index f7dad6de0f..6e4fda289c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/GenericMsgBlock.kt
@@ -7,9 +7,10 @@
 package com.flowcrypt.email.api.retrofit.response.model
 
 import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 
 /**
  * Generic message block represents any message block without a dedicated support.
@@ -21,7 +22,7 @@ import com.google.gson.annotations.Expose
  *
  * @author Ivan Pizhenko
  */
-//@Parcelize
+@Parcelize
 data class GenericMsgBlock(
   @Expose override val type: MsgBlock.Type = MsgBlock.Type.UNKNOWN,
   @Expose override val content: String?,
@@ -36,21 +37,18 @@ data class GenericMsgBlock(
     1 == source.readInt()
   )
 
-  override fun describeContents() = 0
+  companion object : Parceler<GenericMsgBlock> {
 
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeParcelable(type, flags)
-    writeString(content)
-    writeParcelable(error, flags)
-    writeInt(if (isOpenPGPMimeSigned) 1 else 0)
-  }
+    override fun GenericMsgBlock.write(parcel: Parcel, flags: Int) = with(parcel) {
+      writeParcelable(type, flags)
+      writeString(content)
+      writeParcelable(error, flags)
+      writeInt(if (isOpenPGPMimeSigned) 1 else 0)
+    }
 
-  companion object CREATOR : Parcelable.Creator<MsgBlock> {
-    override fun createFromParcel(parcel: Parcel): MsgBlock {
+    override fun create(parcel: Parcel): GenericMsgBlock {
       val partType = parcel.readParcelableViaExt(MsgBlock.Type::class.java)!!
-      return MsgBlockFactory.fromParcel(partType, parcel)
+      return GenericMsgBlock(partType, parcel)
     }
-
-    override fun newArray(size: Int): Array<MsgBlock?> = arrayOfNulls(size)
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt
index 2bf891dc46..accad287dc 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PlainAttMsgBlock.kt
@@ -8,11 +8,13 @@ package com.flowcrypt.email.api.retrofit.response.model
 
 import android.net.Uri
 import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 
-//@Parcelize
+@Parcelize
 data class PlainAttMsgBlock(
   @Expose override val content: String?,
   @Expose override val attMeta: AttMeta,
@@ -22,6 +24,7 @@ data class PlainAttMsgBlock(
 
   var fileUri: Uri? = null
 
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.PLAIN_ATT
 
@@ -34,12 +37,9 @@ data class PlainAttMsgBlock(
     fileUri = source.readParcelableViaExt(Uri::class.java)
   }
 
-  override fun describeContents(): Int {
-    return 0
-  }
+  companion object : Parceler<PlainAttMsgBlock> {
 
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
+    override fun PlainAttMsgBlock.write(parcel: Parcel, flags: Int) = with(parcel) {
       writeParcelable(type, flags)
       writeString(content)
       writeParcelable(attMeta, flags)
@@ -48,12 +48,9 @@ data class PlainAttMsgBlock(
       writeParcelable(fileUri, flags)
     }
 
-  companion object CREATOR : Parcelable.Creator<PlainAttMsgBlock> {
-    override fun createFromParcel(parcel: Parcel): PlainAttMsgBlock {
+    override fun create(parcel: Parcel): PlainAttMsgBlock {
       parcel.readParcelableViaExt(MsgBlock.Type::class.java)
       return PlainAttMsgBlock(parcel)
     }
-
-    override fun newArray(size: Int): Array<PlainAttMsgBlock?> = arrayOfNulls(size)
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt
index 3374a4ccc1..24c1a4625c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/PublicKeyMsgBlock.kt
@@ -6,11 +6,13 @@
 package com.flowcrypt.email.api.retrofit.response.model
 
 import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.security.model.PgpKeyDetails
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 
 /**
  * It's a variant of [MsgBlock] which describes a public key.
@@ -20,13 +22,14 @@ import com.google.gson.annotations.Expose
  * Time: 2:35 PM
  * E-mail: DenBond7@gmail.com
  */
-//@Parcelize
+@Parcelize
 data class PublicKeyMsgBlock constructor(
   @Expose override val content: String?,
   @Expose val keyDetails: PgpKeyDetails? = null,
   @Expose override val error: MsgBlockError? = null,
   @Expose override val isOpenPGPMimeSigned: Boolean
 ) : MsgBlock {
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.PUBLIC_KEY
 
@@ -42,24 +45,20 @@ data class PublicKeyMsgBlock constructor(
       parcel.readParcelableViaExt(RecipientWithPubKeys::class.java)
   }
 
-  override fun writeToParcel(parcel: Parcel, flags: Int) =
-    with(parcel) {
-      writeParcelable(type, flags)
-      writeString(content)
-      writeParcelable(keyDetails, flags)
-      writeParcelable(error, flags)
-      writeInt(if (isOpenPGPMimeSigned) 1 else 0)
-      writeParcelable(existingRecipientWithPubKeys, flags)
-    }
-
-  override fun describeContents(): Int = 0
+  companion object : Parceler<PublicKeyMsgBlock> {
+    override fun PublicKeyMsgBlock.write(parcel: Parcel, flags: Int) =
+      with(parcel) {
+        writeParcelable(type, flags)
+        writeString(content)
+        writeParcelable(keyDetails, flags)
+        writeParcelable(error, flags)
+        writeInt(if (isOpenPGPMimeSigned) 1 else 0)
+        writeParcelable(existingRecipientWithPubKeys, flags)
+      }
 
-  companion object CREATOR : Parcelable.Creator<PublicKeyMsgBlock> {
-    override fun createFromParcel(parcel: Parcel): PublicKeyMsgBlock {
+    override fun create(parcel: Parcel): PublicKeyMsgBlock {
       parcel.readParcelableViaExt(MsgBlock.Type::class.java)
       return PublicKeyMsgBlock(parcel)
     }
-
-    override fun newArray(size: Int): Array<PublicKeyMsgBlock?> = arrayOfNulls(size)
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt
index 64f23cb81a..21bddb3d12 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/model/SignedMsgBlock.kt
@@ -7,15 +7,17 @@
 package com.flowcrypt.email.api.retrofit.response.model
 
 import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.google.gson.annotations.Expose
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 import org.pgpainless.decryption_verification.OpenPgpMetadata
 
 /**
  * Message block which represents content with a signature.
  */
-//@Parcelize
+@Parcelize
 data class SignedMsgBlock(
   @Expose override val content: String?,
   @Expose val signature: String? = null,
@@ -23,8 +25,10 @@ data class SignedMsgBlock(
   @Expose override val isOpenPGPMimeSigned: Boolean
 ) : MsgBlock {
 
+  @IgnoredOnParcel
   var openPgpMetadata: OpenPgpMetadata? = null
 
+  @IgnoredOnParcel
   @Expose
   override val type: MsgBlock.Type = MsgBlock.Type.SIGNED_CONTENT
 
@@ -35,22 +39,19 @@ data class SignedMsgBlock(
     1 == source.readInt()
   )
 
-  override fun describeContents() = 0
+  companion object : Parceler<SignedMsgBlock> {
 
-  override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-    writeParcelable(type, flags)
-    writeString(content)
-    writeString(signature)
-    writeParcelable(error, flags)
-    writeInt(if (isOpenPGPMimeSigned) 1 else 0)
-  }
-
-  companion object CREATOR : Parcelable.Creator<MsgBlock> {
-    override fun createFromParcel(parcel: Parcel): MsgBlock {
-      val partType = parcel.readParcelableViaExt(MsgBlock.Type::class.java)!!
-      return MsgBlockFactory.fromParcel(partType, parcel)
+    override fun SignedMsgBlock.write(parcel: Parcel, flags: Int) = with(parcel) {
+      writeParcelable(type, flags)
+      writeString(content)
+      writeString(signature)
+      writeParcelable(error, flags)
+      writeInt(if (isOpenPGPMimeSigned) 1 else 0)
     }
 
-    override fun newArray(size: Int): Array<SignedMsgBlock?> = arrayOfNulls(size)
+    override fun create(parcel: Parcel): SignedMsgBlock {
+      val partType = requireNotNull(parcel.readParcelableViaExt(MsgBlock.Type::class.java))
+      return MsgBlockFactory.fromParcel(partType, parcel) as SignedMsgBlock
+    }
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt
index 0336b71acb..1c6cd2bd9f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/PublicKeyEntity.kt
@@ -16,6 +16,8 @@ import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.flowcrypt.email.extensions.android.os.readParcelableViaExt
 import com.flowcrypt.email.security.model.PgpKeyDetails
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
 
 /**
  * @author Denis Bondarenko
@@ -51,7 +53,7 @@ import com.flowcrypt.email.security.model.PgpKeyDetails
     )
   ]
 )
-//@Parcelize
+@Parcelize
 data class PublicKeyEntity(
   @PrimaryKey(autoGenerate = true) @ColumnInfo(name = BaseColumns._ID) val id: Long? = null,
   @ColumnInfo(name = "recipient") val recipient: String,
@@ -75,19 +77,6 @@ data class PublicKeyEntity(
     isNotUsable = parcel.readValue(Boolean::class.java.classLoader) as? Boolean
   }
 
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeValue(id)
-    parcel.writeString(recipient)
-    parcel.writeString(fingerprint)
-    parcel.writeByteArray(publicKey)
-    parcel.writeParcelable(pgpKeyDetails, flags)
-    parcel.writeValue(isNotUsable)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false
@@ -114,8 +103,16 @@ data class PublicKeyEntity(
     return result
   }
 
-  companion object CREATOR : Parcelable.Creator<PublicKeyEntity> {
-    override fun createFromParcel(parcel: Parcel): PublicKeyEntity = PublicKeyEntity(parcel)
-    override fun newArray(size: Int): Array<PublicKeyEntity?> = arrayOfNulls(size)
+  companion object : Parceler<PublicKeyEntity> {
+    override fun PublicKeyEntity.write(parcel: Parcel, flags: Int) {
+      parcel.writeValue(id)
+      parcel.writeString(recipient)
+      parcel.writeString(fingerprint)
+      parcel.writeByteArray(publicKey)
+      parcel.writeParcelable(pgpKeyDetails, flags)
+      parcel.writeValue(isNotUsable)
+    }
+
+    override fun create(parcel: Parcel): PublicKeyEntity = PublicKeyEntity(parcel)
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt
index afa3e10cba..db8f18a81b 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/Action.kt
@@ -6,7 +6,6 @@
 package com.flowcrypt.email.service.actionqueue.actions
 
 import android.content.Context
-import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
@@ -54,24 +53,13 @@ interface Action : Parcelable {
     const val TAG_NAME_ACTION_TYPE = "actionType"
   }
 
-  //@Parcelize
-  data class None(override var id: Long = 0) : Action {
-    override val email: String? = null
-    override val version: Int = 0
+  @Parcelize
+  data class None(
+    override var id: Long = 0,
+    override val email: String? = null,
+    override val version: Int = 0,
     override val type: Type = Type.NONE
-
-    constructor(parcel: Parcel) : this(parcel.readLong())
-
+  ) : Action {
     override suspend fun run(context: Context) {}
-    override fun writeToParcel(parcel: Parcel, flags: Int) {
-      parcel.writeLong(id)
-    }
-
-    override fun describeContents(): Int = 0
-
-    companion object CREATOR : Parcelable.Creator<None> {
-      override fun createFromParcel(parcel: Parcel): None = None(parcel)
-      override fun newArray(size: Int): Array<None?> = arrayOfNulls(size)
-    }
   }
 }
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 01c0b8093b..807ad6a457 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
@@ -8,8 +8,6 @@
 package com.flowcrypt.email.service.actionqueue.actions
 
 import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
 import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.protocol.OpenStoreHelper
 import com.flowcrypt.email.api.email.protocol.SmtpProtocolUtil
@@ -19,6 +17,8 @@ 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 kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 /**
  * This action describes a task which backups a private key to INBOX.
@@ -28,13 +28,14 @@ import com.google.gson.annotations.SerializedName
  * Time: 16:58
  * E-mail: DenBond7@gmail.com
  */
-//@Parcelize
+@Parcelize
 data class BackupPrivateKeyToInboxAction @JvmOverloads constructor(
   override var id: Long = 0,
   override var email: String,
   override val version: Int = 0,
   private val privateKeyFingerprint: String
 ) : Action {
+  @IgnoredOnParcel
   @SerializedName(Action.TAG_NAME_ACTION_TYPE)
   override val type: Action.Type = Action.Type.BACKUP_PRIVATE_KEY_TO_INBOX
 
@@ -69,33 +70,7 @@ data class BackupPrivateKeyToInboxAction @JvmOverloads constructor(
     transport.sendMessage(message, message.allRecipients)
   }
 
-  constructor(source: Parcel) : this(
-    source.readLong(),
-    source.readString()!!,
-    source.readInt(),
-    source.readString()!!
-  )
-
   override fun describeContents(): Int {
     return 0
   }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeLong(id)
-      writeString(email)
-      writeInt(version)
-      writeString(privateKeyFingerprint)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<BackupPrivateKeyToInboxAction> =
-      object : Parcelable.Creator<BackupPrivateKeyToInboxAction> {
-        override fun createFromParcel(source: Parcel): BackupPrivateKeyToInboxAction =
-          BackupPrivateKeyToInboxAction(source)
-
-        override fun newArray(size: Int): Array<BackupPrivateKeyToInboxAction?> = arrayOfNulls(size)
-      }
-  }
 }
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 b5da06b4cd..73a55c2090 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
@@ -8,8 +8,6 @@
 package com.flowcrypt.email.service.actionqueue.actions
 
 import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
 import androidx.preference.PreferenceManager
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
@@ -24,6 +22,8 @@ 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 kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 /**
  * This [Action] checks all available private keys are they encrypted. If not we will try to encrypt a key and
@@ -34,12 +34,13 @@ import com.google.gson.annotations.SerializedName
  * Time: 4:03 PM
  * E-mail: DenBond7@gmail.com
  */
-//@Parcelize
+@Parcelize
 data class EncryptPrivateKeysIfNeededAction @JvmOverloads constructor(
   override var id: Long = 0,
   override var email: String? = null,
   override val version: Int = 0
 ) : Action {
+  @IgnoredOnParcel
   @SerializedName(Action.TAG_NAME_ACTION_TYPE)
   override val type: Action.Type = Action.Type.ENCRYPT_PRIVATE_KEYS
 
@@ -105,33 +106,4 @@ data class EncryptPrivateKeysIfNeededAction @JvmOverloads constructor(
         .getDefaultSharedPreferences(context), Constants.PREF_KEY_IS_CHECK_KEYS_NEEDED, false
     )
   }
-
-  constructor(source: Parcel) : this(
-    source.readLong(),
-    source.readString(),
-    source.readInt()
-  )
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) =
-    with(dest) {
-      writeLong(id)
-      writeString(email)
-      writeInt(version)
-    }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<EncryptPrivateKeysIfNeededAction> =
-      object : Parcelable.Creator<EncryptPrivateKeysIfNeededAction> {
-        override fun createFromParcel(source: Parcel): EncryptPrivateKeysIfNeededAction =
-          EncryptPrivateKeysIfNeededAction(source)
-
-        override fun newArray(size: Int): Array<EncryptPrivateKeysIfNeededAction?> =
-          arrayOfNulls(size)
-      }
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt
index c34a9ca03f..1deca0a4de 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/service/actionqueue/actions/LoadGmailAliasesAction.kt
@@ -6,7 +6,6 @@
 package com.flowcrypt.email.service.actionqueue.actions
 
 import android.content.Context
-import android.os.Parcel
 import android.os.Parcelable
 import com.flowcrypt.email.api.email.gmail.GmailApiHelper
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
@@ -14,6 +13,8 @@ import com.flowcrypt.email.database.entity.AccountAliasesEntity
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 /**
  * This action describes a task which loads Gmail aliases for the given account and save them to
@@ -24,22 +25,17 @@ import com.google.gson.annotations.SerializedName
  *         Time: 12:09 PM
  *         E-mail: DenBond7@gmail.com
  */
-//@Parcelize
+@Parcelize
 data class LoadGmailAliasesAction(
   override var id: Long = 0,
   override val email: String? = null,
   override val version: Int = 0
 ) : Action, Parcelable {
 
+  @IgnoredOnParcel
   @SerializedName(Action.TAG_NAME_ACTION_TYPE)
   override val type: Action.Type = Action.Type.LOAD_GMAIL_ALIASES
 
-  constructor(parcel: Parcel) : this(
-    parcel.readLong(),
-    parcel.readString(),
-    parcel.readInt()
-  )
-
   override suspend fun run(context: Context) {
     try {
       email ?: return
@@ -74,24 +70,4 @@ data class LoadGmailAliasesAction(
       ExceptionUtil.handleError(e)
     }
   }
-
-  override fun writeToParcel(parcel: Parcel, flags: Int) {
-    parcel.writeLong(id)
-    parcel.writeString(email)
-    parcel.writeInt(version)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  companion object CREATOR : Parcelable.Creator<LoadGmailAliasesAction> {
-    override fun createFromParcel(parcel: Parcel): LoadGmailAliasesAction {
-      return LoadGmailAliasesAction(parcel)
-    }
-
-    override fun newArray(size: Int): Array<LoadGmailAliasesAction?> {
-      return arrayOfNulls(size)
-    }
-  }
 }

From c5f8aa9a21cb0481ad005f73819be1b3f30b2af4 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Wed, 9 Nov 2022 11:25:05 +0200
Subject: [PATCH 4/4] Fixed resources for tests.| #1034

---
 .../messages/info/encrypted_msg_big_inline_att.json      | 9 +++++----
 ...ypted_msg_hidden_att_pgp_mime_modified_by_google.json | 9 +++++----
 .../messages/info/encrypted_msg_info_error_no_mdc.json   | 9 +++++----
 .../info/encrypted_msg_info_for_2_keys_text.json         | 9 +++++----
 .../assets/messages/info/encrypted_msg_info_text.json    | 9 +++++----
 .../encrypted_msg_info_text_error_badly_formatted.json   | 9 +++++----
 .../info/encrypted_msg_info_text_error_one_pub_key.json  | 9 +++++----
 .../info/encrypted_msg_info_text_with_missing_key.json   | 9 +++++----
 .../encrypted_msg_info_text_with_missing_key_fixed.json  | 9 +++++----
 .../info/encrypted_msg_info_text_with_one_att.json       | 9 +++++----
 .../info/encrypted_msg_info_text_with_pub_key.json       | 9 +++++----
 ...ted_msg_info_text_with_pub_key_mod_after_revoked.json | 8 ++++----
 .../info/encrypted_msg_inline_pub_key_parse_error.json   | 9 +++++----
 .../encrypted_msg_need_passphrase_multiply_keys.json     | 9 +++++----
 .../info/encrypted_msg_need_passphrase_single_key.json   | 9 +++++----
 ...ed_msg_symantec_encryption_server_message_format.json | 9 +++++----
 .../assets/messages/info/message_with_broken_base64.json | 9 +++++----
 .../assets/messages/info/msg_info_8bit-utf8.json         | 9 +++++----
 ...rification_cleartext_missing_pub_key_only_signed.json | 8 ++++----
 .../signature_verification_cleartext_only_signed.json    | 8 ++++----
 ...gnature_verification_cleartext_only_signed_mixed.json | 8 ++++----
 ...ure_verification_cleartext_only_signed_partially.json | 8 ++++----
 .../signature_verification_detached_only_signed.json     | 9 +++++----
 ...ure_verification_detached_only_signed_public_key.json | 9 +++++----
 ...ation_detached_only_signed_public_key_attachment.json | 9 +++++----
 .../signature_verification_inband_encrypted_signed.json  | 9 +++++----
 ...ature_verification_inband_encrypted_signed_mixed.json | 9 +++++----
 ...e_verification_inband_encrypted_signed_partially.json | 9 +++++----
 ...fication_inband_missing_pub_key_encrypted_signed.json | 9 +++++----
 ..._verification_inband_missing_pub_key_only_signed.json | 9 +++++----
 .../signature_verification_inband_only_encrypted.json    | 9 +++++----
 .../info/signature_verification_inband_only_signed.json  | 9 +++++----
 .../signature_verification_inband_only_signed_mixed.json | 9 +++++----
 ...nature_verification_inband_only_signed_partially.json | 9 +++++----
 .../assets/messages/info/signed_msg_armored.json         | 9 +++++----
 .../assets/messages/info/signed_msg_clearsign.json       | 9 +++++----
 .../messages/info/signed_msg_clearsign_broken.json       | 9 +++++----
 .../messages/info/standard_msg_info_plaintext.json       | 9 +++++----
 .../info/standard_msg_info_plaintext_outbox.json         | 9 +++++----
 ...standard_msg_info_plaintext_single_to_replyto_cc.json | 9 +++++----
 .../standard_msg_info_plaintext_to_2_recipients.json     | 9 +++++----
 .../info/standard_msg_info_plaintext_with_one_att.json   | 9 +++++----
 .../info/standard_msg_reply_all_via_gmail_alias.json     | 9 +++++----
 .../messages/info/standard_msg_reply_to_header.json      | 9 +++++----
 ..._pub_key_that_has_no_suitable_encryption_subkeys.json | 9 +++++----
 45 files changed, 220 insertions(+), 180 deletions(-)

diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json
index ecf0da1d9c..aaa98b80ef 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_big_inline_att.json
@@ -57,12 +57,13 @@
     "uid": 17
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "This is an encrypted message with inline attachment"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json
index 2ee180d234..81b4a230e3 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_hidden_att_pgp_mime_modified_by_google.json
@@ -42,12 +42,13 @@
     "isEncrypted": true
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "Encrypted text"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json
index 05115ab78c..adde4279c7 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_error_no_mdc.json
@@ -55,12 +55,13 @@
     "uidAsHEX": "18"
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": ""
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json
index 0dafb7ed6d..16a8bb9a60 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_for_2_keys_text.json
@@ -42,12 +42,13 @@
     "uidAsHEX": "12"
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "It\u0027s an encrypted text"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json
index 4a509ad6e5..de8b088f90 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text.json
@@ -42,12 +42,13 @@
     "uid": 14
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "Simple encrypted text"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json
index dde1594ab6..3450836b4d 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_badly_formatted.json
@@ -61,11 +61,12 @@
   },
   "text": "",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": false,
-    "isEncrypted": false,
     "isPartialSigned": false,
-    "isSigned": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json
index 8d3c0e38b9..c5d8d4caf4 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_error_one_pub_key.json
@@ -67,12 +67,13 @@
     "isEncrypted": true
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test\r\n\tby mail.flowcrypt.test with LMTP\r\n\tid IE29GpAIe19wKAAAZlazJA\r\n\t(envelope-from \u003cdenbond7@flowcrypt.test\u003e)\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon, 05 Oct 2020 11:50:40 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id 69234B2058E\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon,  5 Oct 2020 11:50:40 +0000 (UTC)\r\nContent-Type: multipart/mixed;\r\n boundary\u003d\"----sinikael-?\u003d_1-16018986371740.9899334451956217\"\r\nTo: default@flowcrypt.test\r\nFrom: denbond7@flowcrypt.test\r\nSubject: only one pubkey used for encryption - possibly sender\u0027s error.\r\nDate: Mon, 05 Oct 2020 11:50:37 +0000\r\nMessage-Id: \u003c1601898637180-545631c7-a98f62fb-091da09b@flowcrypt.test\u003e\r\nMime-Version: 1.0",
   "text": "The message below should show a note telling the user that there was only one pubkey used for encryption - possibly sender\u0027s error.\n\nIt should also allow the user import a missing key if they have one."
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json
index f39752b1bf..73fc90c7cf 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key.json
@@ -68,12 +68,13 @@
     "uid": 16
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": ""
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json
index 7d61174b7e..444a7804cb 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_missing_key_fixed.json
@@ -43,12 +43,13 @@
     "uid": 16
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "It\u0027s a message with a missing key."
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json
index b13ab12b42..8747006165 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_one_att.json
@@ -42,12 +42,13 @@
     "uid": 12
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "It\u0027s an encrypted message with one encrypted attachment."
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json
index 1b6bd4c09c..d762c196c9 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key.json
@@ -80,12 +80,13 @@
     "uid": 13
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "It\u0027s an encrypted message with my pub key"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json
index 1e545650c4..b56b8ea295 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_info_text_with_pub_key_mod_after_revoked.json
@@ -1566,12 +1566,12 @@
   },
   "text": "This message contains a pub key that has latModified \u003e than a revoked key. It can be used to test updating revoked keys from the message details screen.",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": true,
-    "hasMixedSignatures": false,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": false,
+    "hasMixedSignatures": false,
     "isPartialSigned": true,
-    "keyIdOfSigningKeys": []
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json
index 4aeea8908f..829f1e650b 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_inline_pub_key_parse_error.json
@@ -51,12 +51,13 @@
     "uidAsHEX": "19"
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "33333"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json
index d80a6ad39d..58ed24946b 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_multiply_keys.json
@@ -59,12 +59,13 @@
     "uidAsHEX": "12"
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": ""
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json
index 992b6babc8..61d2c716cf 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_need_passphrase_single_key.json
@@ -57,12 +57,13 @@
     "uidAsHEX": "e"
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": ""
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json
index c00dc1ea7e..474534440e 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/encrypted_msg_symantec_encryption_server_message_format.json
@@ -43,12 +43,13 @@
     "uidAsHEX": "16"
   },
   "verificationResult": {
-    "isEncrypted": true,
-    "isSigned": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "Some encrypted text"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json b/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json
index ee37ad5f9f..c67b6edc16 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/message_with_broken_base64.json
@@ -42,11 +42,12 @@
   },
   "text": "We have an activity which has a NavHostFragment. The activity receives certain values in its intent. I want to pass this data to the first fragment i.e startDestination of the navigat",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": false,
-    "isEncrypted": false,
     "isPartialSigned": false,
-    "isSigned": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json b/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json
index f953855917..ceca075f02 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/msg_info_8bit-utf8.json
@@ -44,12 +44,13 @@
     "uid": 17
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test\r\n\tby mail.flowcrypt.test with LMTP\r\n\tid 3yVQLfBPe1+6QAAAZlazJA\r\n\t(envelope-from \u003cdenbond7@flowcrypt.test\u003e)\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon, 05 Oct 2020 16:55:12 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id B623BB20B92\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon,  5 Oct 2020 16:55:12 +0000 (UTC)\r\nTo: default@flowcrypt.test\r\nFrom: Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e\r\nSubject: 8bit encoded utf broken\r\nAutocrypt: addr\u003ddenbond7@flowcrypt.test; keydata\u003d\r\n mQENBFyM4vkBCACr8FvuG4MAZsz90hrZ2B+oEznArD46QUbAGrPT8JU6zz27SfLmTTbTA86q\r\n +DVAZC94CZ2lqJaG7KY7eqHFqJObetA8mcUk0Oo3EshphpK0MnNv+bHFpKf/srJgKSDmpCF+\r\n JSHeZs2WAPtrdfoTO1KPy5IZexMWdnhYZy8d0xUr4rPZ7i2UyrkdV3k2O9x4aG5tD1Zo/Wkm\r\n lTv8z2BtAwAziqUQFxABQLu1fzcRkMHTMcGVXrB+73GITl03GbfeJHvFuThhofqP09o/p3Y1\r\n 8Zm+zVWL/T4zsA5P+Cp6kwnwUnQkL3Tc49a0qIJShlP4LbSbPBqFGWTHxceCkFBkMVoJABEB\r\n AAG0LWRlbmJvbmQ3QGRlbmJvbmQ3LmNvbSA8ZGVuYm9uZDdAZGVuYm9uZDcuY29tPokBPwQQ\r\n AQgAKQUCXIzjAQYLCQcIAwIJEGoVBlPxgAh0BBUICgIDFgIBAhkBAhsDAh4BAAoJEGoVBlPx\r\n gAh0L2EIAJRM22lnSHhgQ+waiCf0p739L3XKs2eDZUkxAX+4an654wnn1OjxWrG7lls2GgN1\r\n ziKHHdGgxU4PQ8PmQrgyc6F05vmYihRFaVFDQ97xF16+IvO4xiuYMuJk7ovsr5mrlI43CWE4\r\n f7GPtmJ7QYTlxeYW3s7KLqr0TKxqGG8f6qRjy/Q1ky3qnseR5Fp1GjIwijVI2rncfH0lOkNm\r\n BHj4aYugN60HNlUJbosb2vjJkz5dsqe+nY3XVKI6Iqq07I+Jvankn6jyvlMP8jNLxQMUsqrt\r\n Bki/C6ett3z+JeP2+2Nh+mp1vDW/kO7gSgRHUEPJ9w/VVIpWIOTEv+Bsz3l28h65AQ0EXIzj\r\n AAEIAJKbKexaP/2HqUAj/DxOebhKqw2ddK5HsYacv12pHVTEVjOnLQELyroZ1ikO21UK8Z/z\r\n ng9+8DlCz72SMql+/uZYpoEdgqMy9PU3zPDzGcAeOr07R56G08l+hUO/i3FMW4v2ZT6gLCIn\r\n AJ417wSvF4wg6dJzfrBFkj7o2lyTOwfD87CehQozyGza1cb+yS3ZPC8oc99a1jwSqFYecDI2\r\n 7Cgy7KWSbhSfoPcJG4KPTLDrvVn2Y+U2jxx6OiYXRai8wwlheAmIohmZNpHLaCQiTZTWRYPK\r\n vP0kb6aoN9O4fGhgMh3QAbc2BVwh299rToBieI/zow+I9OcrScejwQNI2VUAEQEAAYkBKQQY\r\n AQgAEwUCXIzjAgkQahUGU/GACHQCGwwACgkQahUGU/GACHSfcQf/euBJSXopDZxAVniN9HDQ\r\n Dga+ccwJYWZvyiDOaGSoSxW3QDhTOWbCH66GkZiOp9KLObHs54KzoOGaOJbQmhWGR4rwNdGS\r\n np8oWimyyXVEHHhir2BmT8MZrMC3WpMPmUlY2v9CMFD7hF2OfmXd1M9fuFT41aZQVDgGSdYc\r\n IQchOmUv3NQUiBJyOlp1bF1RT7Yf3UjAQANyENz19fYHKd2yh9Ltv3CYVjwRB4crQmuESxM8\r\n 7IEXDVNnYOBP0F5WaSQEesFAhjk+cVjxTUfcmM04YEFhedBStsV8kWF50ojYgF9te4yRM/zo\r\n NRi6SjWLSeEw/zIfvkggDvn1UfA2bGFk8Q\u003d\u003d\r\nMessage-ID: \u003c6e66bc34-0e1f-bb13-ccdc-8e61bdf63f6a@flowcrypt.test\u003e\r\nDate: Mon, 5 Oct 2020 19:55:12 +0300\r\nMime-Version: 1.0\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------FD1FA5F98C2FD885200F7353\"\r\nContent-Language: en-US",
   "text": "Text: Ваше оголошення"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json
index 97c9aa11a3..f41101d7a5 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_missing_pub_key_only_signed.json
@@ -49,14 +49,14 @@
   },
   "text": "It\u0026#39;s a cleartext signed message. It was signed with a wrong private key.Sender and signer are different.",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": false,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": true,
+    "hasMixedSignatures": false,
     "isPartialSigned": false,
     "keyIdOfSigningKeys": [
       -5209761791998677675
-    ]
+    ],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": true
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json
index 61a74b91b2..2814d8abc0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed.json
@@ -47,12 +47,12 @@
   },
   "text": "It\u0026#39;s a cleartext signed message",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": false,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": false,
+    "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "keyIdOfSigningKeys": []
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json
index 81914ea401..298ad7281c 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_mixed.json
@@ -47,12 +47,12 @@
   },
   "text": "It\u0026#39;s a cleartext signed with the first key\nIt\u0026#39;s a cleartext signed with the second key",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": true,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": false,
+    "hasMixedSignatures": true,
     "isPartialSigned": false,
-    "keyIdOfSigningKeys": []
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json
index 8394243d92..d8c211e4fa 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_cleartext_only_signed_partially.json
@@ -47,12 +47,12 @@
   },
   "text": "It\u0027s a regular unsigned and unencrypted text.\nIt\u0026#39;s a cleartext signed message",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": false,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": false,
+    "hasMixedSignatures": false,
     "isPartialSigned": true,
-    "keyIdOfSigningKeys": []
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json
index b3c7441eaf..80dc9d6112 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed.json
@@ -48,11 +48,12 @@
   },
   "text": "NOT encrypted + signed(detached)",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": false,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": false,
-    "isPartialSigned": false
+    "hasMixedSignatures": false,
+    "isPartialSigned": false,
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json
index a9e8396918..07ee7e90e0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key.json
@@ -827,11 +827,12 @@
   },
   "text": "NOT encrypted + signed(detached) + public key",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": false,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": false,
-    "isPartialSigned": false
+    "hasMixedSignatures": false,
+    "isPartialSigned": false,
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json
index 3722adc023..1b9b21a995 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_detached_only_signed_public_key_attachment.json
@@ -837,11 +837,12 @@
   },
   "text": "NOT encrypted + signed(detached) + public key + attachment",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": false,
     "hasSignedParts": true,
-    "hasUnverifiedSignatures": false,
-    "isPartialSigned": false
+    "hasMixedSignatures": false,
+    "isPartialSigned": false,
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json
index bced61e816..8eb16c78bf 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed.json
@@ -44,11 +44,12 @@
   },
   "text": "It's encrypted and signed message",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": false,
-    "isEncrypted": true,
     "isPartialSigned": false,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json
index 026cd5b834..376c37aa74 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_mixed.json
@@ -45,11 +45,12 @@
   },
   "text": "Encrypted + signed with the primary key\nEncrypted + signed with the second key",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": true,
     "hasMixedSignatures": true,
-    "hasUnverifiedSignatures": true,
-    "isEncrypted": true,
     "isPartialSigned": false,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": true
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json
index d56c542565..3fbcd04f42 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_encrypted_signed_partially.json
@@ -44,11 +44,12 @@
   },
   "text": "Some encrypted and signed text\nIt\u0027s encrypted only message",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": false,
-    "isEncrypted": true,
     "isPartialSigned": true,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json
index cb57f4ab08..36122fba88 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_encrypted_signed.json
@@ -44,11 +44,12 @@
   },
   "text": "It\u0027s an encrypted message that was signed with a wrong private key. Sender and signer are different.",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": true,
-    "isEncrypted": true,
     "isPartialSigned": false,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": true
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json
index 880023eac9..13a518ebc9 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_missing_pub_key_only_signed.json
@@ -44,11 +44,12 @@
   },
   "text": "It's a regular message that was signed with a wrong private key. Sender and signer are different.",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": true,
-    "isEncrypted": false,
     "isPartialSigned": false,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": true
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json
index dac129a54f..5cd58939ae 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_encrypted.json
@@ -44,11 +44,12 @@
   },
   "text": "It\u0027s encrypted only message",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": true,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": false,
-    "isEncrypted": true,
     "isPartialSigned": false,
-    "isSigned": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json
index 615daf7ebb..8fdf82becb 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed.json
@@ -43,11 +43,12 @@
   },
   "text": "It's signed (Inband) only message.",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": false,
-    "isEncrypted": false,
     "isPartialSigned": false,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json
index bb71f70cf2..7798838e45 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_mixed.json
@@ -45,11 +45,12 @@
   },
   "text": "Signed with a primary key\nSigned with the second key",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": true,
     "hasMixedSignatures": true,
-    "hasUnverifiedSignatures": true,
-    "isEncrypted": false,
     "isPartialSigned": false,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": true
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json
index c1eb8ba5a7..edd476e139 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signature_verification_inband_only_signed_partially.json
@@ -43,11 +43,12 @@
   },
   "text": "Some plain text\nOnly signed message",
   "verificationResult": {
-    "hasBadSignatures": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
-    "hasUnverifiedSignatures": false,
-    "isEncrypted": false,
     "isPartialSigned": true,
-    "isSigned": true
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json
index 4bb902c02d..34a45ea8d0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_armored.json
@@ -43,12 +43,13 @@
     "uidAsHEX": "1a"
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": true,
+    "hasEncryptedParts": false,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "Signed text for default@flowcrypt.test"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json
index 0467a70120..112877a413 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign.json
@@ -43,12 +43,13 @@
     "uidAsHEX": "1c"
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": true,
+    "hasEncryptedParts": false,
+    "hasSignedParts": true,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "Some important text that is signed"
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json
index 2880685a81..163360f4d1 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/signed_msg_clearsign_broken.json
@@ -53,11 +53,12 @@
   },
   "text": "",
   "verificationResult": {
-    "hasBadSignatures": false,
     "hasEncryptedParts": false,
-    "hasMixedSignatures": false,
     "hasSignedParts": false,
-    "hasUnverifiedSignatures": false,
-    "isPartialSigned": false
+    "hasMixedSignatures": false,
+    "isPartialSigned": false,
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   }
 }
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json
index f53b30b35a..9228e86959 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json
@@ -44,12 +44,13 @@
     "uid": 5
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test\r\n\tby mail.flowcrypt.test with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@flowcrypt.test\u003e)\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon,  5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@flowcrypt.test\r\nFrom: Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@flowcrypt.test\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plaintext\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US",
   "text": "It\u0027s a standard message with plaintext"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json
index aeeb956587..63dd2ace7d 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_outbox.json
@@ -43,12 +43,13 @@
     "uid": 5
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test\r\n\tby mail.flowcrypt.test with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@flowcrypt.test\u003e)\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon,  5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@flowcrypt.test\r\nFrom: Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@flowcrypt.test\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plaintext\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US",
   "text": "It\u0027s a standard message with plaintext"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json
index 44572b5cf8..d450712a26 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json
@@ -49,12 +49,13 @@
     "uid": 5
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test\r\n\tby mail.flowcrypt.test with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@flowcrypt.test\u003e)\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon,  5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@flowcrypt.test\r\nFrom: Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@flowcrypt.test\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plaintext\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US",
   "text": "It\u0027s a standard message with plaintext"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json
index defda0e4c3..5d32f166fd 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json
@@ -48,12 +48,13 @@
     "uid": 5
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test\r\n\tby mail.flowcrypt.test with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@flowcrypt.test\u003e)\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon,  5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@flowcrypt.test\r\nFrom: Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@flowcrypt.test\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plaintext\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US",
   "text": "It\u0027s a standard message with plaintext"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json
index c301dc4924..451da1d2bd 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json
@@ -44,12 +44,13 @@
     "uid": 6
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test\r\n\tby mail.flowcrypt.test with LMTP\r\n\tid YISlMxbcel9GEwAAZlazJA\r\n\t(envelope-from \u003cdenbond7@flowcrypt.test\u003e)\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon, 05 Oct 2020 08:40:54 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id D03A0A2098A\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Mon,  5 Oct 2020 08:40:54 +0000 (UTC)\r\nTo: default@flowcrypt.test\r\nFrom: Denis Bondarenko \u003cdenbond7@flowcrypt.test\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003cfacd4f6d-9e74-977b-3f11-abbe7cd467eb@flowcrypt.test\u003e\r\nDate: Mon, 5 Oct 2020 11:40:54 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message + one attachment\r\nContent-Type: multipart/mixed;\r\n boundary\u003d\"------------9575DD1DBF2C2FFA08F4568A\"\r\nContent-Language: en-US",
   "text": "It\u0027s a standard message with plaintext and one attachment"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json
index 445bbc1c17..a02a7eac00 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_all_via_gmail_alias.json
@@ -48,12 +48,13 @@
     }
   ],
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id E24B021EE5\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Tue,  1 Oct 2019 11:25:36 +0000 (UTC)\r\nAuthentication-Results: mail.flowcrypt.test (amavisd-new); dkim\u003dpass\r\n\treason\u003d\"pass (just generated, assumed good)\" header.d\u003dflowcrypt.test\r\nDKIM-Signature: v\u003d1; a\u003drsa-sha256; c\u003drelaxed/simple; d\u003dflowcrypt.test; h\u003d\r\n\tuser-agent:message-id:reply-to:subject:subject:to:from:from:date\r\n\t:date:content-transfer-encoding:content-type:content-type\r\n\t:mime-version; s\u003ddkim; t\u003d1569929122; x\u003d1570793123; bh\u003dx1bgGo2MG/\r\n\tBhDI0wq3RU1YBrrUGERXYHxNAJggBUVNU\u003d; b\u003dHMAJby/fdCu+baav9xxlUpzo4f\r\n\toCJrkHjltgdAUnwvCA7gmFG0rOH366G57fQME7Vv0KtjodHoG3ijNotoJUw+66VS\r\n\tww9CjSWXadPriTIXN/cRzJBnNN9Lvp5qEcg93MI0kTvX5kJHZEAG7jbZZUXX3LUw\r\n\tXWKNohPwqcECOM8fI\u003d\r\nX-Virus-Scanned: Debian amavisd-new at mail.flowcrypt.test\r\nReceived: from mail.flowcrypt.test ([127.0.0.1])\r\n\tby mail.flowcrypt.test (mail.flowcrypt.test [127.0.0.1]) (amavisd-new, port 10026)\r\n\twith ESMTP id 640VPIOx-Lcz for \u003cdefault@flowcrypt.test\u003e;\r\n\tTue,  1 Oct 2019 11:25:22 +0000 (UTC)\r\nReceived: from flowcrypt.test (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTPSA id 6D12421ED6\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Tue,  1 Oct 2019 11:25:22 +0000 (UTC)\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset\u003dUS-ASCII; format\u003dflowed\r\nContent-Transfer-Encoding: 7bit\r\nDate: Tue, 01 Oct 2019 14:25:21 +0300\r\nFrom: denbond7@flowcrypt.test\r\nTo: Default \u003cdefault@flowcrypt.test\u003e\r\nSubject: Honor reply-to address\r\nReply-To: android@flowcrypt.test\r\nMail-Reply-To: android@flowcrypt.test\r\nMessage-ID: \u003c8b50eeb45d3b6cd88be8d06907b171de@flowcrypt.test\u003e\r\nX-Sender: denbond7@flowcrypt.test\r\nUser-Agent: Roundcube Webmail",
   "text": "Some message with some text. See details here https://github.com/FlowCrypt/flowcrypt-android/issues/602"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json
index 22f4f3837d..a0710b5fb0 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_reply_to_header.json
@@ -54,12 +54,13 @@
     }
   ],
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "origMsgHeaders": "Return-Path: \u003cdenbond7@flowcrypt.test\u003e\r\nDelivered-To: default@flowcrypt.test\r\nReceived: from mail.flowcrypt.test (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTP id E24B021EE5\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Tue,  1 Oct 2019 11:25:36 +0000 (UTC)\r\nAuthentication-Results: mail.flowcrypt.test (amavisd-new); dkim\u003dpass\r\n\treason\u003d\"pass (just generated, assumed good)\" header.d\u003dflowcrypt.test\r\nDKIM-Signature: v\u003d1; a\u003drsa-sha256; c\u003drelaxed/simple; d\u003dflowcrypt.test; h\u003d\r\n\tuser-agent:message-id:reply-to:subject:subject:to:from:from:date\r\n\t:date:content-transfer-encoding:content-type:content-type\r\n\t:mime-version; s\u003ddkim; t\u003d1569929122; x\u003d1570793123; bh\u003dx1bgGo2MG/\r\n\tBhDI0wq3RU1YBrrUGERXYHxNAJggBUVNU\u003d; b\u003dHMAJby/fdCu+baav9xxlUpzo4f\r\n\toCJrkHjltgdAUnwvCA7gmFG0rOH366G57fQME7Vv0KtjodHoG3ijNotoJUw+66VS\r\n\tww9CjSWXadPriTIXN/cRzJBnNN9Lvp5qEcg93MI0kTvX5kJHZEAG7jbZZUXX3LUw\r\n\tXWKNohPwqcECOM8fI\u003d\r\nX-Virus-Scanned: Debian amavisd-new at mail.flowcrypt.test\r\nReceived: from mail.flowcrypt.test ([127.0.0.1])\r\n\tby mail.flowcrypt.test (mail.flowcrypt.test [127.0.0.1]) (amavisd-new, port 10026)\r\n\twith ESMTP id 640VPIOx-Lcz for \u003cdefault@flowcrypt.test\u003e;\r\n\tTue,  1 Oct 2019 11:25:22 +0000 (UTC)\r\nReceived: from flowcrypt.test (localhost [127.0.0.1])\r\n\tby mail.flowcrypt.test (Postfix) with ESMTPSA id 6D12421ED6\r\n\tfor \u003cdefault@flowcrypt.test\u003e; Tue,  1 Oct 2019 11:25:22 +0000 (UTC)\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset\u003dUS-ASCII; format\u003dflowed\r\nContent-Transfer-Encoding: 7bit\r\nDate: Tue, 01 Oct 2019 14:25:21 +0300\r\nFrom: denbond7@flowcrypt.test\r\nTo: Default \u003cdefault@flowcrypt.test\u003e\r\nSubject: Honor reply-to address\r\nReply-To: android@flowcrypt.test\r\nMail-Reply-To: android@flowcrypt.test\r\nMessage-ID: \u003c8b50eeb45d3b6cd88be8d06907b171de@flowcrypt.test\u003e\r\nX-Sender: denbond7@flowcrypt.test\r\nUser-Agent: Roundcube Webmail",
   "text": "Some message with some text. See details here https://github.com/FlowCrypt/flowcrypt-android/issues/602"
diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json
index e79dcbc118..e8c43b4e67 100644
--- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json
+++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_with_pub_key_that_has_no_suitable_encryption_subkeys.json
@@ -107,12 +107,13 @@
     "uidAsHEX": "1d"
   },
   "verificationResult": {
-    "isEncrypted": false,
-    "isSigned": false,
+    "hasEncryptedParts": false,
+    "hasSignedParts": false,
     "hasMixedSignatures": false,
     "isPartialSigned": false,
-    "hasUnverifiedSignatures": false,
-    "hasBadSignatures": false
+    "keyIdOfSigningKeys": [],
+    "hasBadSignatures": false,
+    "hasUnverifiedSignatures": false
   },
   "text": "This message has an attached pub key that has no suitable encryption subkeys"
 }