diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 5854b7e05f..be3679a727 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3447,7 +3447,7 @@ public class FragmentCompose extends FragmentBase {
                 else if ("EC".equals(algorithm))
                     algorithm = "ECDSA";
 
-                algorithm = signAlgorithm + "with" + algorithm;
+                algorithm = signAlgorithm.replace("-", "") + "with" + algorithm;
                 Log.i("Sign algorithm=" + algorithm);
 
                 ContentSigner contentSigner = new JcaContentSignerBuilder(algorithm)
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index fbed2fbf0a..986ab350b9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7102,11 +7102,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                     String algo;
                                     try {
                                         DefaultAlgorithmNameFinder af = new DefaultAlgorithmNameFinder();
-                                        algo = af.getAlgorithmName(s.getDigestAlgorithmID()) +
-                                                "/" + af.getAlgorithmName(new ASN1ObjectIdentifier(s.getEncryptionAlgOID()));
+                                        algo = af.getAlgorithmName(new ASN1ObjectIdentifier(s.getEncryptionAlgOID()));
                                     } catch (Throwable ex) {
                                         Log.e(ex);
-                                        algo = s.getDigestAlgOID() + "/" + s.getEncryptionAlgOID();
+                                        algo = s.getEncryptionAlgOID();
                                     }
                                     args.putString("algo", algo);
 
@@ -7225,7 +7224,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                 ? "Signature could not be verified"
                                 : "Certificates and signatures do not match");
 
-
                     if (is != null)
                         decodeMessage(context, is, message, args);
                 } else {
@@ -7391,6 +7389,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                 tvBefore.setText(record.before == null ? null : TF.format(record.before));
                                 tvExpired.setVisibility(record.isExpired(time) ? View.VISIBLE : View.GONE);
 
+                                if (!TextUtils.isEmpty(algo))
+                                    algo = algo.replace("WITH", "/");
                                 tvAlgorithm.setText(algo);
 
                                 ibInfo.setOnClickListener(new View.OnClickListener() {
@@ -7475,7 +7475,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         }
                 } else if (EntityMessage.SMIME_SIGNENCRYPT.equals(type)) {
                     String algo = args.getString("algo");
-                    if (BuildConfig.DEBUG && !TextUtils.isEmpty(algo))
+                    if (!TextUtils.isEmpty(algo))
                         Snackbar.make(view, algo, Snackbar.LENGTH_LONG)
                                 .setGestureInsetBottomIgnored(true).show();
                 }