From db0b900573c5e4e83eaf07b5e8cc7cd811d7b01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Obernd=C3=B6rfer?= <thomas@mailvelope.com>
Date: Tue, 20 Feb 2024 12:07:42 +0000
Subject: [PATCH] Add comment header to encrypted verification email

---
 locales/de.json      | 7 ++++---
 locales/en.json      | 7 ++++---
 src/modules/email.js | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/locales/de.json b/locales/de.json
index 277349d..5118d25 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -1,10 +1,11 @@
 {
   "key_not_found": "Schlüssel nicht gefunden",
+  "removal_success": "E-Mail Adresse {{email}} aus dem Schlüssel Verzeichnis entfernt",
+  "verify_key_comment": "Mit Mailvelope/PGP entschlüsseln und dann den Link klicken",
   "verify_key_subject": "Bestätigen Sie Ihre E-Mail-Adresse",
   "verify_key_text": "Hallo {name},\n\nbitte bestätigen Sie Ihre E-Mail-Adresse {email}.\nKlicken Sie hierzu auf den folgenden Link:\n\n{link}\n\nNach der Bestätigung Ihrer E-Mail-Adresse ist ihr öffentlicher Schlüssel in unserem Schlüssel Verzeichnis verfügbar.\n\nWeitere Informationen finden Sie unter {host}.\n\nIhr Mailvelope Team",
-  "verify_success_header": "E-Mail Adresse {{email}} erfolgreich verifiziert",
-  "verify_success_link": "Ihr öffentlicher OpenPGP Schlüssel ist ab jetzt unter folgendem Link verfügbar:",
   "verify_removal_subject": "Entfernen Ihres Schlüssels bestätigen",
   "verify_removal_text": "Hallo {name},\n\nbitte bestätigen Sie das Entfernen Ihrer E-Mail-Adresse {email} von unserem Key Server ({host}).\nKlicken Sie hierzu auf den folgenden Link:\n\n{link}\n\nIhr Mailvelope Team",
-  "removal_success": "E-Mail Adresse {{email}} aus dem Schlüssel Verzeichnis entfernt"
+  "verify_success_header": "E-Mail Adresse {{email}} erfolgreich verifiziert",
+  "verify_success_link": "Ihr öffentlicher OpenPGP Schlüssel ist ab jetzt unter folgendem Link verfügbar:"
 }
diff --git a/locales/en.json b/locales/en.json
index 941d756..b07ed2a 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1,10 +1,11 @@
 {
   "key_not_found": "Key not found",
+  "removal_success": "Email address {{email}} removed from the key directory",
+  "verify_key_comment": "Use Mailvelope/PGP to decrypt the message and click the link",
   "verify_key_subject": "Verify your email address",
   "verify_key_text": "Hello {name},\n\nplease verify your email address {email} by clicking on the following link:\n\n{link}\n\nAfter verification of your email address, your public key is available in our key directory.\n\nYou can find more info at {host}.\n\nGreetings from the Mailvelope Team",
-  "verify_success_header": "Email address {{email}} successfully verified",
-  "verify_success_link": "Your public OpenPGP key is now available at the following link:",
   "verify_removal_subject": "Verify key removal",
   "verify_removal_text": "Hello {name},\n\nplease verify removal of your email address {email} from our key server ({host}) by clicking on the following link:\n\n{link}\n\nGreetings from the Mailvelope Team",
-  "removal_success": "Email address {{email}} removed from the key directory"
+  "verify_success_header": "Email address {{email}} successfully verified",
+  "verify_success_link": "Your public OpenPGP key is now available at the following link:"
 }
diff --git a/src/modules/email.js b/src/modules/email.js
index e94bc6a..0ab5503 100644
--- a/src/modules/email.js
+++ b/src/modules/email.js
@@ -54,7 +54,7 @@ class Email {
       i18n
     });
     if (this._usePGPEncryption && publicKeyArmored) {
-      compiled.text = await this._pgpEncrypt(compiled.text, publicKeyArmored);
+      compiled.text = await this._pgpEncrypt(compiled.text, publicKeyArmored, i18n);
     }
     const sendOptions = {
       from: {name: this._sender.name, address: this._sender.email},
@@ -71,7 +71,7 @@ class Email {
    * @param  {String} publicKeyArmored  the recipient's public key
    * @return {Promise<String>}          the encrypted PGP message block
    */
-  async _pgpEncrypt(plaintext, publicKeyArmored) {
+  async _pgpEncrypt(plaintext, publicKeyArmored, i18n) {
     let key;
     try {
       key = await openpgp.readKey({armoredKey: publicKeyArmored});
@@ -84,7 +84,8 @@ class Email {
       const ciphertext = await openpgp.encrypt({
         message,
         encryptionKeys: key,
-        date: util.getTomorrow()
+        date: util.getTomorrow(),
+        config: {showComment: true, commentString: `*** ${i18n.__('verify_key_comment')} ***`}
       });
       return ciphertext;
     } catch (error) {