diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 931c88653a..435b07e5c5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5392,7 +5392,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                         target.setCertificate(cert);
 
                                         // Load/store intermediate certificates
-                                        List<X509Certificate> local = new ArrayList<>();
+                                        List<X509Certificate> local = new ArrayList<>(certs);
                                         try {
                                             List<EntityCertificate> ecs = db.certificate().getIntermediateCertificate();
                                             for (EntityCertificate ec : ecs)
@@ -5421,7 +5421,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                             }
                                         } catch (Throwable ex) {
                                             Log.e(ex);
-                                            local = certs;
                                         }
 
                                         // Intermediate certificates