diff --git a/FAQ.md b/FAQ.md
index 424c1bb0c5..095b088e91 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2100,6 +2100,8 @@ Try to switch to port 993 (IMAP) or 465 (SMTP) with SSL/TLS.
 
 Android 8 Oreo and later [do not support](https://developer.android.com/about/versions/oreo/android-8.0-changes#security-all) SSLv3 anymore.
 There is no way to workaround lacking RC4 and SSLv3 support because it has completely been removed from Android (which should say something).
+Since version 1.2121 the Bouncy Castle secure socket provider ([JSSE](https://en.wikipedia.org/wiki/Java_Secure_Socket_Extension)) is bundled.
+Enabling this socket provider in the connection-settings tab and enabling '*Allow insecure connections*' in the account/identity settings *might* solve this problem.
 
 The error '*javax.net.ssl.SSLHandshakeException: Read error: ... TLSV1_ALERT_INTERNAL_ERROR*' means that Android and the email server share no common protocol versions and/or common ciphers.
 
diff --git a/index.html b/index.html
index 64d3f4b60c..53a56d9c9e 100644
--- a/index.html
+++ b/index.html
@@ -1174,7 +1174,7 @@ X-Google-Original-From: Somebody &lt;somebody+extra@example.org&gt;</code></pre>
 <p>The error ‘<em>Handshake failed SSL handshake terminated … SSLV3_ALERT_HANDSHAKE_FAILURE … HANDSHAKE_FAILURE_ON_CLIENT_HELLO</em>’ can be caused by <a href="https://issuetracker.google.com/issues/37122132">this Android 7.0 bug</a>. This can unfortunately not be fixed by FairEmail.</p>
 <p>The error ‘<em>Handshake failed … UNSUPPORTED_PROTOCOL or TLSV1_ALERT_PROTOCOL_VERSION or SSLV3_ALERT_HANDSHAKE_FAILURE …</em>’ might be caused by enabling <strong>hardening connections</strong> or <strong>Bouncy Castle</strong> in the connection settings tab page, or by Android not supporting older protocols anymore, like SSLv3 and TLSv1.</p>
 <p>The error ‘<em>javax.net.ssl.SSLHandshakeException: Read error: … CERT_LENGTH_MISMATCH</em>’ means that there is something wrong with the email server setup. Try to switch to port 993 (IMAP) or 465 (SMTP) with SSL/TLS.</p>
-<p>Android 8 Oreo and later <a href="https://developer.android.com/about/versions/oreo/android-8.0-changes#security-all">do not support</a> SSLv3 anymore. There is no way to workaround lacking RC4 and SSLv3 support because it has completely been removed from Android (which should say something).</p>
+<p>Android 8 Oreo and later <a href="https://developer.android.com/about/versions/oreo/android-8.0-changes#security-all">do not support</a> SSLv3 anymore. There is no way to workaround lacking RC4 and SSLv3 support because it has completely been removed from Android (which should say something). Since version 1.2121 the Bouncy Castle secure socket provider (<a href="https://en.wikipedia.org/wiki/Java_Secure_Socket_Extension">JSSE</a>) is bundled. Enabling this socket provider in the connection-settings tab and enabling ‘<em>Allow insecure connections</em>’ in the account/identity settings <em>might</em> solve this problem.</p>
 <p>The error ‘<em>javax.net.ssl.SSLHandshakeException: Read error: … TLSV1_ALERT_INTERNAL_ERROR</em>’ means that Android and the email server share no common protocol versions and/or common ciphers.</p>
 <p>Please <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket">see here</a> for an overview of supported protocols and cipher suites by Android version.</p>
 <p>You can use <a href="https://ssl-tools.net/mailservers">this website</a> or <a href="https://www.immuniweb.com/ssl/">this website</a> to check for SSL/TLS problems of email servers.</p>