diff --git a/FAQ.md b/FAQ.md
index 8d95042157..18d875a3e8 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1186,9 +1186,7 @@ Please see [here](https://support.google.com/pixelphone/answer/2844832?hl=en) ho
 
 The use of expired keys, inline encrypted/signed messages and hardware security tokens is not supported.
 
-If you are looking for a free (test) S/MIME certificate, see [here](http://kb.mozillazine.org/Getting_an_SMIME_certificate) for the options.
-Please be sure to [read this first](https://davidroessli.com/logs/2019/09/free-smime-certificates-in-2019/#update20191219)
-if you want to request an S/MIME Actalis certificate.
+If you want a free S/MIME certificate, [see here](https://acme.castle.cloud/)
 
 Posteo offers cheap certificates, [see here](https://posteo.de/blog/neu-bei-posteo-smime-zertifikate-erstellen-und-sofort-nutzen) (German).
 
@@ -1208,13 +1206,13 @@ You can decode S/MIME signatures, etc, [here](https://lapo.it/asn1js/).
 
 <br />
 
-*Planck Security* (formerly: *pretty Easy privacy* or p≡p)
+~~*Planck Security* (formerly: *pretty Easy privacy* or p≡p)~~
 
-There is still no approved standard for p≡p and not many people are using it.
+~~There is still no approved standard for p≡p and not many people are using it.~~
 
-However, FairEmail can send and receive PGP encrypted messages, which are compatible with p≡p.
-Also, FairEmail understands incoming p≡p messages since version 1.1519,
-so the encrypted subject will be shown and the embedded message text will be shown more nicely.
+~~However, FairEmail can send and receive PGP encrypted messages, which are compatible with p≡p.~~
+~~Also, FairEmail understands incoming p≡p messages since version 1.1519,~~
+~~so the encrypted subject will be shown and the embedded message text will be shown more nicely.~~
 
 <br />
 
diff --git a/index.html b/index.html
index 37af78fb4c..0d7929cc31 100644
--- a/index.html
+++ b/index.html
@@ -833,9 +833,9 @@ openssl pkcs12 -export -legacy -in certbag.pem &gt;legacy.p12</code></pre>
 <pre><code>openssl smime -verify &lt;xxx.eml</code></pre>
 <p>You can decode S/MIME signatures, etc, <a href="https://lapo.it/asn1js/">here</a>.</p>
 <p><br /></p>
-<p><em>Planck Security</em> (formerly: <em>pretty Easy privacy</em> or p≡p)</p>
-<p>There is still no approved standard for p≡p and not many people are using it.</p>
-<p>However, FairEmail can send and receive PGP encrypted messages, which are compatible with p≡p. Also, FairEmail understands incoming p≡p messages since version 1.1519, so the encrypted subject will be shown and the embedded message text will be shown more nicely.</p>
+<p><del><em>Planck Security</em> (formerly: <em>pretty Easy privacy</em> or p≡p)</del></p>
+<p><del>There is still no approved standard for p≡p and not many people are using it.</del></p>
+<p><del>However, FairEmail can send and receive PGP encrypted messages, which are compatible with p≡p.</del> <del>Also, FairEmail understands incoming p≡p messages since version 1.1519,</del> <del>so the encrypted subject will be shown and the embedded message text will be shown more nicely.</del></p>
 <p><br /></p>
 <p>S/MIME sign/encrypt is a pro feature, but all other PGP and S/MIME operations are free to use.</p>
 <p><br /></p>