diff --git a/app/src/main/java/eu/faircode/email/AdapterCertificate.java b/app/src/main/java/eu/faircode/email/AdapterCertificate.java
index 0332e9edf6..750531ed22 100644
--- a/app/src/main/java/eu/faircode/email/AdapterCertificate.java
+++ b/app/src/main/java/eu/faircode/email/AdapterCertificate.java
@@ -197,7 +197,7 @@ public class AdapterCertificate extends RecyclerView.Adapter<AdapterCertificate.
             String subject = certificate.subject;
             String algo = certificate.getSigAlgName();
             if (algo != null)
-                subject = algo + " " + subject;
+                subject = algo.replaceAll("(?i)With", "/") + " " + subject;
             tvSubject.setText(subject);
             tvAfter.setText(certificate.after == null ? null : TF.format(certificate.after));
             tvBefore.setText(certificate.before == null ? null : TF.format(certificate.before));
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 3b5b3f3c7d..01e691916f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -10453,7 +10453,7 @@ public class FragmentMessages extends FragmentBase
                                 tvExpired.setVisibility(record.isExpired(time) ? View.VISIBLE : View.GONE);
 
                                 if (!TextUtils.isEmpty(algo))
-                                    algo = algo.replace("WITH", "/");
+                                    algo = algo.replace("(?i)With", "/");
                                 tvAlgorithm.setText(algo);
 
                                 ibInfo.setOnClickListener(new View.OnClickListener() {