diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 498863ce81..582cd8029e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2528,7 +2528,7 @@ public class FragmentCompose extends FragmentBase {
                             public void onClick(View v) {
                                 startActivity(
                                         new Intent(getContext(), ActivitySetup.class)
-                                                .putExtra("tab", "privacy"));
+                                                .putExtra("tab", "encryption"));
                             }
                         });
                     snackbar.show();
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 983a4409b3..72d6e70f04 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -201,8 +201,8 @@ public class FragmentOptions extends FragmentBase {
             pager.setCurrentItem(3);
         else if ("display".equals(tab))
             pager.setCurrentItem(4);
-        else if ("privacy".equals(tab))
-            pager.setCurrentItem(6);
+        else if ("encryption".equals(tab))
+            pager.setCurrentItem(7);
         getActivity().getIntent().removeExtra("tab");
     }