Revert OpenKeychain check

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -1576,9 +1576,7 @@ public class FragmentCompose extends FragmentBase {
                 if (identity == null)
                     return draft.ui_encrypt;
 
-                if (identity.encrypt == 0 && !Helper.isOpenKeychainInstalled(context))
+                if (encrypt_default || identity.encrypt_default)
-                    draft.ui_encrypt = null;
-                else if (encrypt_default || identity.encrypt_default)
                     draft.ui_encrypt = (identity.encrypt == 0
                             ? EntityMessage.PGP_SIGNENCRYPT
                             : EntityMessage.SMIME_SIGNENCRYPT);
@@ -4960,7 +4958,6 @@ public class FragmentCompose extends FragmentBase {
                                 !"editasnew".equals(action))
                             data.draft.plain_only = 1;
 
-                        if (selected.encrypt != 0 || Helper.isOpenKeychainInstalled(context))
                         if (encrypt_default || selected.encrypt_default)
                             if (selected.encrypt == 0)
                                 data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;