diff --git a/FlowCrypt/Functionality/Services/Local Pub Key Services/Models/PubKey.swift b/FlowCrypt/Functionality/Services/Local Pub Key Services/Models/PubKey.swift
index 2a33d4934..a5b6feca3 100644
--- a/FlowCrypt/Functionality/Services/Local Pub Key Services/Models/PubKey.swift	
+++ b/FlowCrypt/Functionality/Services/Local Pub Key Services/Models/PubKey.swift	
@@ -26,6 +26,8 @@ struct PubKey {
     let algo: KeyAlgo?
     /// is key revoked
     let isRevoked: Bool
+    /// user emails
+    let emails: [String]
 }
 
 extension PubKey {
@@ -59,7 +61,8 @@ extension PubKey {
                   fingerprints: fingerprints,
                   created: Date(timeIntervalSince1970: Double(keyDetails.created)),
                   algo: keyDetails.algo,
-                  isRevoked: keyDetails.revoked)
+                  isRevoked: keyDetails.revoked,
+                  emails: keyDetails.pgpUserEmails)
     }
 }
 
diff --git a/FlowCryptAppTests/Functionality/Services/Key Services/Models/RecipientTests.swift b/FlowCryptAppTests/Functionality/Services/Key Services/Models/RecipientTests.swift
index 62305941d..6ba1d8d49 100644
--- a/FlowCryptAppTests/Functionality/Services/Key Services/Models/RecipientTests.swift	
+++ b/FlowCryptAppTests/Functionality/Services/Key Services/Models/RecipientTests.swift	
@@ -14,7 +14,7 @@ class RecipientTests: XCTestCase {
 
     func testRecipientWithRevokedKey() {
         let keyDetails = KeyStorageMock.createFakeKeyDetails(expiration: nil, revoked: true)
-        let recipient = RecipientWithSortedPubKeys(email: "test@test.com", keyDetails: [keyDetails])
+        let recipient = RecipientWithSortedPubKeys(email: "test@flowcrypt.com", keyDetails: [keyDetails])
 
         XCTAssertEqual(recipient.keyState, .revoked)
     }
@@ -23,23 +23,24 @@ class RecipientTests: XCTestCase {
         let expiration = Date().timeIntervalSince1970 - 60 * 60
         let keyDetails = KeyStorageMock.createFakeKeyDetails(expiration: Int(expiration))
 
-        let recipient = RecipientWithSortedPubKeys(email: "test@test.com", keyDetails: [keyDetails])
+        let recipient = RecipientWithSortedPubKeys(email: "test@flowcrypt.com", keyDetails: [keyDetails])
         XCTAssertEqual(recipient.keyState, .expired)
     }
 
     func testRecipientWithValidKey() {
         let expiration = Date().timeIntervalSince1970 + 60 * 60
         let keyDetails = KeyStorageMock.createFakeKeyDetails(expiration: Int(expiration))
-        let recipient = RecipientWithSortedPubKeys(email: "test@test.com", keyDetails: [keyDetails])
+        let recipient = RecipientWithSortedPubKeys(email: "test@flowcrypt.com", keyDetails: [keyDetails])
         XCTAssertEqual(recipient.keyState, .active)
+        XCTAssertEqual(recipient.pubKeys.first?.emails, ["test@flowcrypt.com"])
 
         let keyDetails2 = KeyStorageMock.createFakeKeyDetails(expiration: nil)
-        let recipient2 = RecipientWithSortedPubKeys(email: "test@test.com", keyDetails: [keyDetails2])
+        let recipient2 = RecipientWithSortedPubKeys(email: "test@flowcrypt.com", keyDetails: [keyDetails2])
         XCTAssertEqual(recipient2.keyState, .active)
     }
 
     func testRecipientWithoutPubKey() {
-        let recipient = RecipientWithSortedPubKeys(email: "test@test.com", keyDetails: [])
+        let recipient = RecipientWithSortedPubKeys(email: "test@flowcrypt.com", keyDetails: [])
         XCTAssertEqual(recipient.keyState, .empty)
     }
 
@@ -56,7 +57,7 @@ class RecipientTests: XCTestCase {
         let oldExpiredKey = KeyStorageMock.createFakeKeyDetails(expiration: now - 2 * 3600)
 
         let keyDetails = [revokedKey, oldExpiredKey, activeKey1, expiredKey, activeKey2, nonExpiringKey, activeKey3]
-        let recipient = RecipientWithSortedPubKeys(email: "test@test.com",
+        let recipient = RecipientWithSortedPubKeys(email: "test@flowcrypt.com",
                                                    keyDetails: keyDetails)
 
         XCTAssertEqual(recipient.pubKeys[0].fingerprint, nonExpiringKey.primaryFingerprint)
diff --git a/FlowCryptAppTests/Mocks/KeyStorageMock.swift b/FlowCryptAppTests/Mocks/KeyStorageMock.swift
index 1973e7c45..b8c1212cb 100644
--- a/FlowCryptAppTests/Mocks/KeyStorageMock.swift
+++ b/FlowCryptAppTests/Mocks/KeyStorageMock.swift
@@ -39,7 +39,7 @@ extension KeyStorageMock {
             created: 1,
             lastModified: nil,
             expiration: expiration,
-            users: [],
+            users: ["Test User <test@flowcrypt.com>"],
             algo: nil,
             revoked: revoked
         )