From 59b79a81fd91cc69e5257ac09a4c0cd282b4e74a Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Wed, 28 Aug 2024 18:06:46 -0400
Subject: [PATCH] Bug 1915356 - Add PGP Thunderbird integration section in
 SecureMail help page

---
 .../en/default/pages/securemail/help.html.tmpl     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl
index 2f58ec215f..8e4107e753 100644
--- a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl
+++ b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl
@@ -85,6 +85,8 @@ be required to decrypt it to view the reset instructions.
 
 <h2>PGP</h2>
 
+<h3>Setup</h3>
+
 <b>PGP keys must be ASCII-armoured - i.e. text, with the first line containing BEGIN PGP PUBLIC KEY.</b></p>
 
 <p>If you already have your own PGP key in a keyring, skip straight to step 3. Otherwise:</p>
@@ -123,6 +125,18 @@ be required to decrypt it to view the reset instructions.
   </li>
 </ol>
 
+<h3>Thunderbird</h3>
+
+<ul>
+  <li>Open Thunderbird.</li>
+  <li>Open Account Settings.</li>
+  <li>Open End-To-End Encryption.</li>
+  <li>In the OpenPGP section, click Add Key and create a new key.</li>
+  <li>Back in the End-To-End Encryption settings, click on OpenPGP Key Manager.</li>
+  <li>Click your new key and then File -> Export Public Key(s) to a file.</li>
+  <li>Copy and paste the file contents to the Secure Mail preferences in your Bugzilla settings.</li>
+</ul>
+
 <p>Further reading: <a href="https://www.madboa.com/geek/gpg-quickstart/">GPG Quickstart</a>.</p>
 
 [% PROCESS global/footer.html.tmpl %]