Added subtitles, refactoring

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

@@ -159,9 +159,10 @@ public class FragmentAccount extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setSubtitle(R.string.title_edit_account);
         setHasOptionsMenu(true);
 
+        setSubtitle(R.string.title_edit_account);
+
         view = (ViewGroup) inflater.inflate(R.layout.fragment_account, container, false);
 
         // Get controls

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

@@ -56,6 +56,8 @@ public class FragmentAnswer extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        setSubtitle(R.string.menu_answers);
+
         view = (ViewGroup) inflater.inflate(R.layout.fragment_answer, container, false);
 
         // Get controls

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

@@ -48,10 +48,11 @@ public class FragmentAnswers extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_answers, container, false);
+        setSubtitle(R.string.menu_answers);
-
         setHasOptionsMenu(true);
 
+        View view = inflater.inflate(R.layout.fragment_answers, container, false);
+
         // Get controls
         rvAnswer = view.findViewById(R.id.rvAnswer);
         pbWait = view.findViewById(R.id.pbWait);

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

@@ -69,9 +69,10 @@ public class FragmentFolders extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_folders, container, false);
         setHasOptionsMenu(true);
 
+        View view = inflater.inflate(R.layout.fragment_folders, container, false);
+
         // Get controls
         ibHintActions = view.findViewById(R.id.ibHintActions);
         ibHintSync = view.findViewById(R.id.ibHintSync);

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

@@ -214,10 +214,10 @@ public class FragmentMessages extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        view = (ViewGroup) inflater.inflate(R.layout.fragment_messages, container, false);
-
         setHasOptionsMenu(true);
 
+        view = (ViewGroup) inflater.inflate(R.layout.fragment_messages, container, false);
+
         // Get controls
         swipeRefresh = view.findViewById(R.id.swipeRefresh);
         tvSupport = view.findViewById(R.id.tvSupport);