diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ff1a218c75..547164e02b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1643,7 +1643,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             boolean auto_decrypt = prefs.getBoolean("auto_decrypt", false);
-            if (auto_decrypt && (is_signed || is_encrypted))
+            if (auto_decrypt && is_encrypted)
                 onActionDecrypt(message, true);
 
             cbInline.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 3b071124e4..c007e8d2ef 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1218,6 +1218,7 @@ public class FragmentCompose extends FragmentBase {
 
                 Intent intent;
                 if (EntityMessage.PGP_SIGNONLY.equals(draft.encrypt)) {
+                    // TODO use previously selected sign key
                     intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID);
                     intent.putExtra(BuildConfig.APPLICATION_ID, working);
                 } else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.encrypt)) {