diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 5ab86b0b9f..0cb90d62af 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -42,6 +42,10 @@ import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 import androidx.work.WorkManager;
 
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import java.security.Provider;
+import java.security.Security;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -51,6 +55,22 @@ public class ApplicationEx extends Application
         implements SharedPreferences.OnSharedPreferenceChangeListener {
     private Thread.UncaughtExceptionHandler prev = null;
 
+    static {
+        try {
+            Provider[] providers = Security.getProviders();
+            for (int p = 0; p < providers.length; p++)
+                if (BouncyCastleProvider.PROVIDER_NAME.equals(providers[p].getName())) {
+                    Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+                    Provider bc = new BouncyCastleProvider();
+                    Security.insertProviderAt(bc, p + 1);
+                    Log.i("Replacing provider " + providers[p] + " at " + p + " by " + bc);
+                    break;
+                }
+        } catch (Throwable ex) {
+            Log.e(ex);
+        }
+    }
+
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(getLocalizedContext(base));