diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 45e107a7a9..e2733d2a3b 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -117,6 +117,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
         Toolbar toolbar = holder.findViewById(R.id.toolbar);
         View placeholder = holder.findViewById(R.id.placeholder);
 
+        ViewGroup.LayoutParams lp = toolbar.getLayoutParams();
+        lp.height = Helper.getActionBarHeight(this);
+        toolbar.setLayoutParams(lp);
+
         toolbar.setPopupTheme(getThemeId());
         if (hide_toolbar) {
             AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 28c7b509a8..aa229212ac 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -920,7 +920,8 @@ public class Helper {
             if (context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
                 DisplayMetrics dm = context.getResources().getDisplayMetrics();
                 actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, dm);
-            } else
+            }
+            if (actionBarHeight == null || actionBarHeight <= 0)
                 actionBarHeight = Helper.dp2pixels(context, 56);
         }