diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index e65a45d9fb..eabf093487 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -159,9 +159,8 @@ public class FragmentAccount extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setHasOptionsMenu(true);
-
         setSubtitle(R.string.title_edit_account);
+        setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_account, container, false);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index c4ca60bb09..239062b6a6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -394,10 +394,11 @@ public class FragmentCompose extends FragmentBase {
 
         ((ActivityBase) getActivity()).addBackPressedListener(onBackPressedListener);
 
-        setHasOptionsMenu(true);
 
         // Initialize
         setSubtitle(R.string.title_compose);
+        setHasOptionsMenu(true);
+
         etExtra.setHint("");
         tvDomain.setText(null);