diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index de4689a8b4..03ffb5fdce 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -134,10 +134,12 @@ public class FragmentBase extends Fragment {
         if (actionbar == null)
             return;
 
-        if ((actionbar.getDisplayOptions() & DISPLAY_SHOW_CUSTOM) == 0)
+        Toolbar toolbar = activity.findViewById(R.id.toolbar);
+
+        if ((actionbar.getDisplayOptions() & DISPLAY_SHOW_CUSTOM) == 0 && toolbar == null)
             return;
 
-        final View custom = actionbar.getCustomView();
+        View custom = (toolbar == null ? actionbar.getCustomView() : toolbar);
         if (custom == null)
             return;