diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 5de09c97cf..dc912e9676 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -8031,6 +8031,15 @@ public class FragmentCompose extends FragmentBase {
                             return null;
                         }
 
+                        @Override
+                        protected void onExecuted(Bundle args, Void data) {
+                            int encrypt = args.getInt("encrypt");
+
+                            boolean none = EntityMessage.ENCRYPT_NONE.equals(encrypt);
+                            tvRemindPgp.setVisibility(remind_pgp && none ? View.VISIBLE : View.GONE);
+                            tvRemindSmime.setVisibility(remind_smime && none ? View.VISIBLE : View.GONE);
+                        }
+
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
                             Log.unexpectedError(getParentFragmentManager(), ex);