diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 23eec44f9d..57ed124cdb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -269,8 +269,8 @@ public class FragmentCompose extends FragmentBase {
     private ImageButton ibReferenceImages;
     private View vwAnchor;
     private TextViewAutoCompleteAction etSearch;
-    private BottomNavigationView block_bar;
     private BottomNavigationView style_bar;
+    private BottomNavigationView block_bar;
     private BottomNavigationView media_bar;
     private BottomNavigationView bottom_navigation;
     private ContentLoadingProgressBar pbWait;
@@ -396,8 +396,8 @@ public class FragmentCompose extends FragmentBase {
         ibReferenceImages = view.findViewById(R.id.ibReferenceImages);
         vwAnchor = view.findViewById(R.id.vwAnchor);
         etSearch = view.findViewById(R.id.etSearch);
-        block_bar = view.findViewById(R.id.block_bar);
         style_bar = view.findViewById(R.id.style_bar);
+        block_bar = view.findViewById(R.id.block_bar);
         media_bar = view.findViewById(R.id.media_bar);
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
 
@@ -1014,6 +1014,14 @@ public class FragmentCompose extends FragmentBase {
             }
         });
 
+        style_bar.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
+            @Override
+            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+                int action = item.getItemId();
+                return onActionStyle(action, style_bar.findViewById(action));
+            }
+        });
+
         block_bar.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
             public boolean onNavigationItemSelected(@NonNull MenuItem item) {
@@ -1082,14 +1090,6 @@ public class FragmentCompose extends FragmentBase {
             }
         });
 
-        style_bar.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
-            @Override
-            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                int action = item.getItemId();
-                return onActionStyle(action, style_bar.findViewById(action));
-            }
-        });
-
         media_bar.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
             public boolean onNavigationItemSelected(@NonNull MenuItem item) {
@@ -1173,8 +1173,8 @@ public class FragmentCompose extends FragmentBase {
         ibReferenceImages.setVisibility(View.GONE);
         tvReference.setVisibility(View.GONE);
         etSearch.setVisibility(View.GONE);
-        block_bar.setVisibility(View.GONE);
         style_bar.setVisibility(View.GONE);
+        block_bar.setVisibility(View.GONE);
         media_bar.setVisibility(View.GONE);
         bottom_navigation.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index cc6b0f9e4e..3cfc13e3b3 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -22,7 +22,7 @@
             android:id="@+id/scroll"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/media_bar"
+            app:layout_constraintBottom_toTopOf="@+id/block_bar"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -577,23 +577,10 @@
             android:maxLines="1"
             android:padding="6dp"
             app:end_drawable="@drawable/twotone_fast_forward_24"
-            app:layout_constraintBottom_toTopOf="@id/block_bar"
+            app:layout_constraintBottom_toTopOf="@id/style_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/block_bar"
-            android:layout_width="0dp"
-            android:layout_height="36dp"
-            android:background="?attr/colorActionBackground"
-            app:itemIconTint="@color/action_foreground"
-            app:itemTextColor="@color/action_foreground"
-            app:labelVisibilityMode="unlabeled"
-            app:layout_constraintBottom_toTopOf="@+id/style_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:menu="@menu/action_compose_paragraph" />
-
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/style_bar"
             android:layout_width="0dp"
@@ -602,11 +589,24 @@
             app:itemIconTint="@color/action_foreground"
             app:itemTextColor="@color/action_foreground"
             app:labelVisibilityMode="unlabeled"
-            app:layout_constraintBottom_toTopOf="@+id/media_bar"
+            app:layout_constraintBottom_toTopOf="@+id/block_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:menu="@menu/action_compose_style" />
 
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/block_bar"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:background="?attr/colorActionBackground"
+            app:itemIconTint="@color/action_foreground"
+            app:itemTextColor="@color/action_foreground"
+            app:labelVisibilityMode="unlabeled"
+            app:layout_constraintBottom_toTopOf="@+id/media_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:menu="@menu/action_compose_paragraph" />
+
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/media_bar"
             android:layout_width="0dp"