#2580 Implement better detection of "multipart/encrypted" email with …

…PGP encrypted message (#2643) * fix: better detection of multipart encrypted email * feat: added ui test * fix: pr reviews
FlowCrypt · Nov 15, 2024 · 52edb18 · 52edb18
1 parent 5be5b9a
commit 52edb18
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 8 deletions.
diff --git a/FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+MessageExtension.swift b/FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+MessageExtension.swift
@@ -101,10 +101,6 @@ private extension GTLRGmail_Message {
         payload?.parts?.filter(\.filename.isEmptyOrNil) ?? []
     }
 
-    var attachmentParts: [GTLRGmail_MessagePart] {
-        payload?.parts?.filter { !$0.filename.isEmptyOrNil } ?? []
-    }
-
     func parseMessageBody() -> MessageBody {
         let html = body(type: .textHtml)
         var text = body(type: .textPlain) ?? html ?? ""
@@ -147,13 +143,13 @@ private extension GTLRGmail_Message {
     }
 
     func parseAttachments() -> [MessageAttachment] {
-        attachmentParts.compactMap {
-            guard let body = $0.body, let id = body.attachmentId, let name = $0.filename
+        (payload?.parts ?? []).compactMap {
+            guard let body = $0.body, let id = body.attachmentId
             else { return nil }
 
             return MessageAttachment(
                 id: Identifier(stringId: id),
-                name: name,
+                name: $0.filename ?? "noname",
                 estimatedSize: body.size?.intValue,
                 mimeType: $0.mimeType,
                 data: body.data?.data()

diff --git a/appium/api-mocks/apis/google/exported-messages/message-export-18f5b8fe65b3c1cf.json b/appium/api-mocks/apis/google/exported-messages/message-export-18f5b8fe65b3c1cf.json
@@ -0,0 +1,110 @@
+{
+  "acctEmail": "[email protected]",
+  "full": {
+    "id": "18f5b8fe65b3c1cf",
+    "threadId": "18f5b8fe65b3c1cf",
+    "labelIds": ["INBOX"],
+    "snippet": "",
+    "payload": {
+      "partId": "",
+      "mimeType": "multipart/encrypted",
+      "filename": "",
+      "headers": [
+        {
+          "name": "X-Gm-Message-State",
+          "value": "AOJu0Yy57zz3I7cn+42ayeeMpQpKJ3dhHgYAt5SiNFaiPqevkFzW5YSF UeOm+P61OQUlOWuBh8OYEW4zArad4JV7h0UQVF5oNMu6lwWpmjHQ/aqt+serPOU="
+        },
+        {
+          "name": "Date",
+          "value": "Wed, 8 May 2024 21:14:57 -0700 (PDT)"
+        },
+        {
+          "name": "From",
+          "value": "[email protected]"
+        },
+        {
+          "name": "To",
+          "value": "[email protected]"
+        },
+        {
+          "name": "Subject",
+          "value": "Canary Mail PGP encrypted emails cannot be read by Flowcrypt recipient"
+        },
+        {
+          "name": "MIME-Version",
+          "value": "1.0"
+        },
+        {
+          "name": "Content-Type",
+          "value": "multipart/encrypted; boundary=\"----=_Part_7_39145192.1715228097793\""
+        }
+      ],
+      "body": {
+        "size": 0
+      },
+      "parts": [
+        {
+          "partId": "0",
+          "mimeType": "application/pgp-encrypted",
+          "filename": "",
+          "headers": [
+            {
+              "name": "Content-Type",
+              "value": "application/pgp-encrypted"
+            },
+            {
+              "name": "Content-Transfer-Encoding",
+              "value": "7bit"
+            }
+          ],
+          "body": {
+            "attachmentId": "ANGjdJ9sOhlWfn5akc9uzyUwmt9Di388WiqiOuJOpwdvXol8naReG4bc8a0HQchnADCLilBLp87xem_Vf2WALzsWFpskPVwPZUecPQN3QBr-WxF--wdeNreKOesfleRfNQWJXy5d7eWANo37mY_Dhf9OvvmlN0O0aRrvt-UmbpFlTBRvLNOqZAza8Q8GG_qJwyCgof3Ax9qAQMnv0I4eRhQJMifiM1ewKSt6YR75HyFaA8wGJpPmm28iQU2WPtFGqkMgJaK4OzYny2qW3HBBzOss_TRjxRhpRKJ0E4KqMuW-5-t5CuqanXeCrTSNTcSjqjAzS8DugURE3hRgI7xZfZ3IT_XXSloS-6X8jl6M9C0SxwMkA5m_tQb48vXyE5E",
+            "size": 12
+          }
+        },
+        {
+          "partId": "1",
+          "mimeType": "application/octet-stream",
+          "filename": "",
+          "headers": [
+            {
+              "name": "Content-Type",
+              "value": "application/octet-stream"
+            },
+            {
+              "name": "Content-Transfer-Encoding",
+              "value": "7bit"
+            }
+          ],
+          "body": {
+            "attachmentId": "ANGjdJ8CLh9k8xMwuCuh01qQKbp6KiIfA7SdntD0Oh3_Oo4otzLyroJgs9w36NFWFpy7BXQg9JNwGEw0miIn0HC6SbSUOwOer2JMD3sJ75rpv0hJuOB0YLrQ1UEXp6zpKLWWUixwcKc_8ioRoyUBYcpEOUdGaAvWc1QY8nsrdYodZty8OvqoXQMBGQC2TKW3J84OspIJrAbIHSSrYHD5zT5bx9sWI-8DJIb0-ydkBFkov0k6YUybWBc8sfqLpU0kmfUMgGcUzmFbcYksLYisftOLpZRDYztKP7_P5joq82S2z2UgadbwnDuYrCw2gertdOnRzaSxkqP2eUcSxqHM-tStExS483MvbwGk0G8cGP_9IZ13eGIVRus_7uxaots",
+            "size": 2550
+          }
+        }
+      ]
+    },
+    "sizeEstimate": 8223,
+    "historyId": "1470755",
+    "internalDate": "1715228097000"
+  },
+  "attachments": {
+    "ANGjdJ9sOhlWfn5akc9uzyUwmt9Di388WiqiOuJOpwdvXol8naReG4bc8a0HQchnADCLilBLp87xem_Vf2WALzsWFpskPVwPZUecPQN3QBr-WxF--wdeNreKOesfleRfNQWJXy5d7eWANo37mY_Dhf9OvvmlN0O0aRrvt-UmbpFlTBRvLNOqZAza8Q8GG_qJwyCgof3Ax9qAQMnv0I4eRhQJMifiM1ewKSt6YR75HyFaA8wGJpPmm28iQU2WPtFGqkMgJaK4OzYny2qW3HBBzOss_TRjxRhpRKJ0E4KqMuW-5-t5CuqanXeCrTSNTcSjqjAzS8DugURE3hRgI7xZfZ3IT_XXSloS-6X8jl6M9C0SxwMkA5m_tQb48vXyE5E": {
+      "data": "VmVyc2lvbjogMQ0K",
+      "size": 12
+    },
+    "ANGjdJ8CLh9k8xMwuCuh01qQKbp6KiIfA7SdntD0Oh3_Oo4otzLyroJgs9w36NFWFpy7BXQg9JNwGEw0miIn0HC6SbSUOwOer2JMD3sJ75rpv0hJuOB0YLrQ1UEXp6zpKLWWUixwcKc_8ioRoyUBYcpEOUdGaAvWc1QY8nsrdYodZty8OvqoXQMBGQC2TKW3J84OspIJrAbIHSSrYHD5zT5bx9sWI-8DJIb0-ydkBFkov0k6YUybWBc8sfqLpU0kmfUMgGcUzmFbcYksLYisftOLpZRDYztKP7_P5joq82S2z2UgadbwnDuYrCw2gertdOnRzaSxkqP2eUcSxqHM-tStExS483MvbwGk0G8cGP_9IZ13eGIVRus_7uxaots": {
+      "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBCQ1BHIHYxLjcwDQoNCmhGNEQ2eTFwNFV4cXdZQVNBUWRBdVlNZDdXcHFtRk1sNEpTWjBuVXpmTmxxS1BMZVlnZk5hci9qVVZvL2JVNHcNCkc4ajByeDJWSHBPSUs3L0RkLzJkb3UzSmthZEpVb0FVSm1heUxZMm9OSDh3NkNRd1ZJTkNWbG8wVjRVMXlhS3INCmhRSU1BMHRhTC96bUxaVUJBUS8rSjlpUnhuSlVkWFAyYm9qUGNwTHg5dFJEQzZZOEZnWG51T0lHQUVYYjVhZkgNCi9HOVloenN1Ymd1Y1VmTVpnKzRuTHZzdTRxZE9oeGJEUHNsQ1hCT3VsdlRCMENqRzJJL3hxN05kcU8reTBCS1cNCkVRR09BN044NmU3aStwc0d5NTFteVZ0akxPT2ZDcU9Beit2Q1YrVTNiNzcrQ1MzV0EvV1o2UjB5Zk81bzA2bDINCnlEaVpBeWZIQ3pIMUJlYWdSdE1xSFMvbWtYbUlYcFVMb1ZvemxldFh2ZXJHTk9FSnlxU2RQSWFhTk9jN2JLRHoNClBNWHc0ckcwT3NWaHJqRklLZXJpY1NXeUVjNmNwaW8yWWhuZ2VCRUtVWEJ6aTRrbWdtRVQ1TXZrR1hsKzQyaEwNCnVuZVFyMWM3VzdOMUtuL1FmWHVpclVxdHJYVXhwUm1QS3RxRjJMMWMveldsNkY5WGFWb2NMcHZSWis1OWw3YmsNClAzZi93SFk4QU8xVTYxSTZhV3dTNitqNlA0N1pWV3hKcHdkenQrUVl2ekRLK1c4a1g4ZlVTeHZzRm00Nk5hVFoNCnUzKy96WURzRzhzMWlaVDl1eGtKUkp6MitMVVI5SFJyQW5ZM1hiOGxqNWRxRG1UZXBzNGYvUGw3SjkyblY1blENCjNQNVBmQU9mRGwyd1pVVDZQTGszZmFzQ3p1c0phYStYckZYVmYwaTVoWlhoODN3VGRCeld5ZWF5b1pva1loU0oNCnlrRnpveXF2TUZkVDRQdllXZVgrdnlmYzN6K2F3bGFlTk9Edy93R1Zkem1vWUdWOGhpQndHZE5wYVRBempvSUwNCk53R003a0RkWllMeUEybXhQb2JqeW45VHVoYWRaNElVbGY3TXZwUVF6RHhLSGhESjYrK1VwOXdDYTAwVFEyalMNCnc4MEJzZmdEZ0w3S3BEakI0VHB4bXEvVldra3A1OG5xZ2l6Sm1UZVlWK1hkbTFBVitKNzVmcnBNazhQY2NnbGENCjMvVW9WTDZQT1p1RHdna05SRDFtU1lWVWM5NDByQTJVV0dTNC9nL1hMb0hZMnM3WWhpWUduMnNhZWVQVkJoUVoNCi9laVJkcXpMaThPb3R4eHJTTm90WVhYamQ0azZibExVa3pORktsVDNlSDZPRmFScmxqZUFHKzl6dGZrWXQreFUNCmRGbk5BZDJ5SUhhNm9PSEd2WmpJU3ZFVW95WXYwRjJrRW5zWFA0eHhQQlJLOGxuaTdPMFVLSDNrNURKV1lqbkMNCjF3ZUJZeklnWFZqWW84Z2wzZWxtdnZ6M29NVlg5T1pWNWpFNzhHTHFsS3AvK0RDNlU1RXpQMVIvdkJHejd3YTANCkFXQ0d5NkRDZ2R2dnFWVWp6V0trTXhUMDhWeHhjOG43RUNOOGQ3dlQ2cWw4SXYyZ2tkWXYxYTI5L1ZFTkI1dnENCmlaS3JSTjc4ZlpyazFweWl6eDhNeTZVMGRWNkliWXBITU9hUFFUak5YUC84SVZGUFNUK1NJS0JXODVrbll3aG4NCjIzVmJlR1BYSmp4ZWhhSml5dTVrVW5WcytSOVBrYTNCZEM0UVdFQ3A4QTRzaHcvc0QyckZQNnQ0S25idU1QWmcNCjM2S05MUDhRMVR6eFVQVkNPY0RVNUVFRlgraHEybDllMXN5MmRQN2xsNkFid05oSWdTaitjbEtsUHFqZ3NpTm8NCis4aGZxU3oyVHpLZGltSmN4a0FxdFZXYzFzMm1iL0VidngrektjUmZQWGlSanNLNmNRYzVHVzBJS044SXh0ZGgNCjBicTdGbTZUalZsTzZzRzkxbDJ3b2h1U1NiSk1WdHFISGdVZ2JaZXlFNXlXL0NWdFJiZnpBOTJSODBrcjhhQjMNCk1kbFFrdDlWZi9veEJsSnJTQlFxNko1N093VDEra1VQeUxhOEx6cTdqaUZmYUt4WVRtaklDSkJqanpWcyt2ZTcNClN5OUVSOWZUNnpWV0hJSUdielpxd3o4d3NTWVZQcFZnMXN0T2xibEwzbHBoK1JXcEhKd0VOUHdIQ05ucG8zTkYNCmRQTFJXSEVKUHJQV3JsdW9ybDNoQlI1emlINUxTM3FkNEZvZkxzNmN3S3R0b0E0Y2hCRVNRRENKWmtLOTloeEQNClMvM2hXNno1ZkExY2tLT1gzeUdUdDVxaUNHMmdMS0hueWx4OGtOR2xBekZnZXpFOEp2QUdYZitnZ054NUJDVnINClE5V2pJSmNlSFZjNUlFcmJsbWJWZWlOTE5tZ2pLQ0dkTDhmMWFiSVpYRGJTTy9kWFJQRVFFdi9pUm8reU9QSHENCkxxTmRSai82VWl0YnVwVHh3ZGNhazlmcWJac3lSM0RCL2N4TngxUWZsaFZGMVR6VGRiYSt3RzFlaFEwM3JBZUMNCjRhcmhBRkJZRlJLWG5rUHZvUnhsRklYTXRRV25DbjZkaHlNcWg0ZUZqNklIMi9zenFIS3k4cXM0aW1ZV1owWFENCmZScUZIS2NxaHg3d1o0RTNGUTVPWjdNYVI3U0ZreGhKVzlkbXdsY2xKWjArNVlqeE1vakdNSFlZS214Wm5PTmwNCk9ubTdrdnZDSDZBT2QvLzc3cEEzUlVLejlFNnZNS2hmTWdvRHVOVHF5RWhLOThHUkRpSkh4SGFKS0g5R3dkUmsNCjNIVWNXWEMrdXVJTkExSjNZVHN4UGsxVkxkZURoL3NBSDhORXdQR01GNndmZUwvekp0VGJ2TUtvM2tyWDQ0WUsNCjZPOG9IbDJKSkZVL092SUFYcElLT0hhcWE1ajRyczBNek9jS1M2Ni8yc1kzVEI3dDBZNWNiN2ZabmJrazRlVnENCkppU0drbEhqM0E2Vmsva0M3eHlQUU9jMjNaR2dRSlBKMTZsL1RGNmVYTEdZaVRyQ1JrWW9YTDhFWXZrczlod2QNCmpoYnZLQk5DME0zWCtvaXJrOVFxcEpJSFllRERoMWdiekpDY1UyUStnRmpxQU00SGEwMnhkTHJaMzQ1UUVKZjQNCjdlWVQwbW02c2NMNGY5WHVmekdNDQo9bFg0VQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K",
+      "size": 2550
+    }
+  },
+  "raw": {
+    "id": "18f5b8fe65b3c1cf",
+    "threadId": "18f5b8fe65b3c1cf",
+    "labelIds": ["Label_27", "Label_1562903719323611078", "CATEGORY_PERSONAL"],
+    "snippet": "",
+    "sizeEstimate": 8223,
+    "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 2002:ac8:4dc8:0:b0:43d:4cdf:8196 with SMTP id g8csp846738qtw;
        Wed, 8 May 2024 21:15:08 -0700 (PDT)
X-Received: by 2002:a17:906:3113:b0:a59:c46b:c524 with SMTP id a640c23a62f3a-a59fb7107bcmr326948066b.0.1715228108332;
        Wed, 08 May 2024 21:15:08 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1715228108; cv=none;
        d=google.com; s=arc-20160816;
        b=Iub2oRzX90DARH/XWOyvpDQY3MDvrZ/hAcoW7CtPHeCVHGDJV96CcRnh8Obe/wxWJY
         ca7wzW7d5bQgQ3bWQZ3QOCcYI52tdjeYfEL7vUDIru19wI0YMYrKIH+wM0huARcQanG6
         gEzv34lZg60olFYAPqhdeAJgzJvVbSQEM9V1bOjpj/5z7mEuqAjhvdMnyN63PD+zR9QH
         xvpSUKbvm6KUAWPkVl2uvEEOmIKFmc2rC5JhQHqkCDNHcxxhPKVPvu/oEBTXED8M1fIG
         28jlFPRvesvTA8XdwHR3CkAEI0cLYizM39Qh5NwgQ53uVTbyQ8VkJEjTq3E+XqHw6D+S
         uQ6w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=mime-version:subject:message-id:to:from:date:dkim-signature;
        bh=lJa9ITBgWEtR+3WRTTT8o1TRJWUAYDjs5xLYl2S4bgY=;
        fh=GWUVAppNLbGGkjvVvxCvODlfD19Zs9z+oGKNxNwACbQ=;
        b=lhveqprQxiZZbyePR8JGO+o7NSXexwv9G/tY+39RycyxBSSuKtvhxy+ZvjVfiqt1Ni
         mowzlo+7PVzh0dg2SrU5PhcxRd8vxrYabh3VHUTtP/Hw95PylWLCWAHC7OvC4BbeoSCz
         WKLsFP0bCUU1Zt3XaxuSB+aDd84uQw3DfX/QOHj88nMOIdJwtrjOJOWNkMJLbFyGn8Jk
         +w7zO7gEGigh3rkfyWGqBtxW8ggW4H9S90QK1KEdnLHzZm+yMH5Aho9Kia715kyjH6Wx
         tlpHtryoUPRdOKmCfFfeGYEJcT4GOaeeNZq5xVFGkcnLnilQtmRYmOBcmREpZ+U7hMJC
         MfsA==;
        dara=google.com
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@gmail.com header.s=20230601 header.b=ACEgHBw0;
       spf=pass (google.com: domain of bbelot@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=bbelot@gmail.com;
       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Return-Path: <bbelot@gmail.com>
Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
        by mx.google.com with SMTPS id a640c23a62f3a-a5a17826b8bsor13871066b.1.2024.05.08.21.15.08
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Wed, 08 May 2024 21:15:08 -0700 (PDT)
Received-SPF: pass (google.com: domain of bbelot@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@gmail.com header.s=20230601 header.b=ACEgHBw0;
       spf=pass (google.com: domain of bbelot@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=bbelot@gmail.com;
       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1715228107; x=1715832907; dara=google.com;
        h=mime-version:subject:message-id:to:from:date:from:to:cc:subject
         :date:message-id:reply-to;
        bh=lJa9ITBgWEtR+3WRTTT8o1TRJWUAYDjs5xLYl2S4bgY=;
        b=ACEgHBw0kJd0fDQizBW/Ye8maEhs2QqATeWLlyfxZDzoGizsmKuks43avAGoL7jwcd
         1yJ3Qitw8TmenkCrURvFNpJfypbeLudl0SliSRqpUyl4W0bh6xvIQtt/nEo98BUb8qMX
         J41XYrdoq/efleobLIn4nrSVkIcvl/ktEqzMHsqHXAh3jRXfzg6rgPQCEWGJZ8s/yUvA
         yladCZz96S4ToXacTXg5fSJFV/Ej7fsDqZInyqyo1N1sLGpyXuH6V3sBpOMvBcslYlfo
         AcLlc6ai2pKCLfqeq1qhmGB2Iq9+4WreevzWLL6Ez2bvEOEkCt7AAOj2Fwx93T0Yjj+e
         u36w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1715228107; x=1715832907;
        h=mime-version:subject:message-id:to:from:date:x-gm-message-state
         :from:to:cc:subject:date:message-id:reply-to;
        bh=lJa9ITBgWEtR+3WRTTT8o1TRJWUAYDjs5xLYl2S4bgY=;
        b=cAHoAy1Q+ZERDswr8eMAc3Y3v0oXpG/mB7J7dqtzneiGuYHLGZ01NvNmrdOHRC5Ces
         ux7td5GJQ0nWi0WphDy4R0XA2gJR+oxR2buY/h1IHGfSi0Xih1uSyTOigOV3Rj3XLv7o
         7tZv992eOcMZLGQTDhyUVBlFQBTidsBHqYXQGiLKQQ31eMh350/w8xKvEaryfSr7dmFV
         lTG5reIqTmVrxOBn83YCDlaV/0xOMar4oL3y86LNTZ0ipTNApLXztEEXIzC0G08Ud1mF
         m1vBeRQprZrBujAR8hFzyMgt3ZPeTbQyOO45KgHUGOb1W4KWzVlPfRC5zV7l1owmkzsF
         v4NA==
X-Gm-Message-State: AOJu0Yy57zz3I7cn+42ayeeMpQpKJ3dhHgYAt5SiNFaiPqevkFzW5YSF
	UeOm+P61OQUlOWuBh8OYEW4zArad4JV7h0UQVF5oNMu6lwWpmjHQ/aqt+serPOU=
X-Google-Smtp-Source: AGHT+IEvSyYUZQE+TF21dR4mzxPvJg/QHcEqFhQiCkyGnvUaRw/E6TV6S39GEwlAZtxpuzzPFGXQPQ==
X-Received: by 2002:a17:906:c043:b0:a59:9e01:e787 with SMTP id a640c23a62f3a-a59fb968b23mr242652266b.34.1715228106741;
        Wed, 08 May 2024 21:15:06 -0700 (PDT)
Return-Path: <bbelot@gmail.com>
Received: from localhost ([2606:1a40:1035:0:c4c5:163b:3571:9101])
        by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a1781d4b2sm30348066b.27.2024.05.08.21.15.05
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
        Wed, 08 May 2024 21:15:06 -0700 (PDT)
Date: Wed, 8 May 2024 21:14:57 -0700 (PDT)
From: Brian Belot <bbelot@gmail.com>
To: "flowcrypt.compatibility@gmail.com" <flowcrypt.compatibility@gmail.com>
Message-ID: <b16d859c-4abd-4d5e-ac33-5f356afea42b@Canary>
Subject: Canary Mail PGP encrypted emails cannot be read by Flowcrypt
 recipient, but PGP emails from Flowcrypt can be read in Canary
MIME-Version: 1.0
Content-Type: multipart/encrypted; 
	boundary="----=_Part_7_39145192.1715228097793"

------=_Part_7_39145192.1715228097793
Content-Type: application/pgp-encrypted
Content-Transfer-Encoding: 7bit

Version: 1

------=_Part_7_39145192.1715228097793
Content-Type: application/octet-stream
Content-Transfer-Encoding: 7bit

-----BEGIN PGP MESSAGE-----
Version: BCPG v1.70

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
7eYT0mm6scL4f9XufzGM
=lX4U
-----END PGP MESSAGE-----

------=_Part_7_39145192.1715228097793--
",
+    "historyId": "1470755",
+    "internalDate": "1715228097000"
+  }
+}
diff --git a/appium/api-mocks/apis/google/google-messages.ts b/appium/api-mocks/apis/google/google-messages.ts
@@ -32,4 +32,5 @@ export type GoogleMockMessage =
   | 'Email with another user public key attached'
   | 'Test remote images #2414'
   | 'Test Spoofed email by Mart'
-  | 'Test encrypted message sent via encrypted contact page with attachment';
+  | 'Test encrypted message sent via encrypted contact page with attachment'
+  | 'Canary Mail PGP encrypted emails cannot be read by Flowcrypt recipient';