Improve encrypted message detection for multipart email

FlowCrypt · May 21, 2024 · 9278181 · 9278181
1 parent d4b2b95
commit 9278181
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/extension/js/common/api/email-provider/gmail/gmail-parser.ts b/extension/js/common/api/email-provider/gmail/gmail-parser.ts
@@ -165,7 +165,9 @@ export class GmailParser {
       const parts = payload.parts!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
       // are we dealing with a PGP/MIME encrypted message?
       const pgpEncrypted = Boolean(
-        parts.length === 2 && contentType?.value?.startsWith('multipart/encrypted;') && contentType.value.includes('protocol="application/pgp-encrypted"')
+        parts.length === 2 &&
+          contentType?.value?.startsWith('multipart/encrypted') &&
+          (contentType.value.includes('protocol="application/pgp-encrypted"') || parts[0]?.mimeType?.includes('application/pgp-encrypted'))
       );
       for (const [i, part] of parts.entries()) {
         GmailParser.findAttachments(part, internalMsgId, internalResults, {