From d416ab3642303c195c03b939d738072ca7bf8ec2 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 1 Nov 2022 19:52:24 +0100
Subject: [PATCH] Bugfix OpenPGP.js sign HTML failed #600

---
 dev/Stores/User/Pgp.js    | 2 +-
 dev/View/Popup/Compose.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/Stores/User/Pgp.js b/dev/Stores/User/Pgp.js
index 8ba92bffd..f881ba227 100644
--- a/dev/Stores/User/Pgp.js
+++ b/dev/Stores/User/Pgp.js
@@ -161,7 +161,7 @@ export const
 						*/
 						const body = message.body;
 						body.textContent = '';
-						let result = await mailvelope.createDisplayContainer(
+						result = await mailvelope.createDisplayContainer(
 							'#'+body.id,
 							armoredText,
 							this.mailvelopeKeyring,
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index e7621ef0d..2c68f240c 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -169,7 +169,7 @@ class MimePart {
 		const hasSub = this.children.length,
 			boundary = this.boundary || (this.boundary = 'part' + Jua.randomId()),
 			headers = this.headers;
-		if (hasSub) {
+		if (hasSub && !headers['Content-Type'].includes(boundary)) {
 			headers['Content-Type'] += `; boundary="${boundary}"`;
 		}
 		let result = Object.entries(headers).map(([key, value]) => `${key}: ${value}`).join('\r\n') + '\r\n';