diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 4ff72545a2..d97acb7adb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1350,16 +1350,16 @@ public class FragmentCompose extends FragmentBase {
                     }
 
                     Intent intent;
-                    if (EntityMessage.PGP_SIGNONLY.equals(draft.encrypt)) {
+                    if (EntityMessage.PGP_SIGNONLY.equals(draft.encrypt))
                         intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID);
-                        intent.putExtra(BuildConfig.APPLICATION_ID, working);
-                    } else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.encrypt)) {
+                    else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.encrypt)) {
                         intent = new Intent(OpenPgpApi.ACTION_GET_KEY_IDS);
                         intent.putExtra(OpenPgpApi.EXTRA_USER_IDS, pgpUserIds);
-                        intent.putExtra(BuildConfig.APPLICATION_ID, working);
                     } else
                         throw new IllegalArgumentException("Invalid encrypt=" + draft.encrypt);
 
+                    intent.putExtra(BuildConfig.APPLICATION_ID, working);
+
                     onPgp(intent);
                 } catch (Throwable ex) {
                     if (ex instanceof IllegalArgumentException)
@@ -1800,7 +1800,6 @@ public class FragmentCompose extends FragmentBase {
                                 } else {
                                     // Get sign key
                                     Intent intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID);
-                                    intent.putExtra(OpenPgpApi.EXTRA_USER_IDS, pgpUserIds);
                                     intent.putExtra(BuildConfig.APPLICATION_ID, draft.id);
                                     return intent;
                                 }