Merge branch 'master' into issue-5905-add-secure-reply-all-to-gmail-context-menu-live-test

Author: martgil

extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts

@@ -181,10 +181,11 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
     { msgUrl, externalId }: { msgUrl: string; externalId?: string },
     signingPrv?: Key
   ) => {
-    // encoded as: PGP/MIME-like structure but with attachments as external files due to email size limit (encrypted for pubkeys only)
+    // encoded as: PGP/MIME-like structure
     const msgBody = this.richtext ? { 'text/plain': newMsg.plaintext, 'text/html': newMsg.plainhtml } : { 'text/plain': newMsg.plaintext };
+    const attachments = await this.view.attachmentsModule.attachment.collectEncryptAttachments(pubs);
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    const pgpMimeNoAttachments = await Mime.encode(msgBody, { Subject: newMsg.subject }, []); // no attachments, attached to email separately
+    const pgpMimeNoAttachments = await Mime.encode(msgBody, { Subject: newMsg.subject }, attachments);
     const { data: pubEncryptedNoAttachments } = await this.encryptDataArmor(Buf.fromUtfStr(pgpMimeNoAttachments), undefined, pubs, signingPrv); // encrypted only for pubs
     const emailIntroAndLinkBody = await this.formatPwdEncryptedMsgBodyLink(msgUrl);
     return await SendableMsg.createPwdMsg(

test/source/mock/google/strategies/send-message-strategy.ts

@@ -30,7 +30,7 @@ const checkForAbsenceofBase64InAttachments = async (attachments: Attachment[]) =
     if (typeof encoding !== 'string') {
       throw new HttpClientErr(`Error: Content-Transfer-Encoding isn't present in one of the attachments`);
     }
-    if (!['7bit', 'quoted-printable'].includes(encoding)) {
+    if (!['7bit', 'quoted-printable', 'base64'].includes(encoding)) {
       throw new HttpClientErr(`Error: Unexpected Content-Transfer-Encoding: ${encoding}`);
     }
   }