diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 369c2f0006..aadd0c4590 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -175,6 +175,7 @@ public class FragmentCompose extends FragmentBase {
     private boolean autosave = false;
     private boolean busy = false;
 
+    private boolean style = true;
     private boolean encrypt = false;
     private OpenPgpServiceConnection pgpService;
 
@@ -185,6 +186,9 @@ public class FragmentCompose extends FragmentBase {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         pro = Helper.isPro(getContext());
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        style = prefs.getBoolean("style_toolbar", true);
     }
 
     @Override
@@ -733,9 +737,11 @@ public class FragmentCompose extends FragmentBase {
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
+
         menu.findItem(R.id.menu_addresses).setVisible(working >= 0);
         menu.findItem(R.id.menu_zoom).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
+        menu.findItem(R.id.menu_style_toolbar).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_encrypt).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_send_after).setVisible(state == State.LOADED);
 
@@ -744,6 +750,8 @@ public class FragmentCompose extends FragmentBase {
         menu.findItem(R.id.menu_encrypt).setEnabled(!busy);
         menu.findItem(R.id.menu_send_after).setEnabled(!busy);
 
+        menu.findItem(R.id.menu_style_toolbar).setChecked(style);
+
         menu.findItem(R.id.menu_encrypt).setChecked(encrypt);
         bottom_navigation.getMenu().findItem(R.id.action_send)
                 .setTitle(encrypt ? R.string.title_encrypt : R.string.title_send);
@@ -765,9 +773,11 @@ public class FragmentCompose extends FragmentBase {
             case R.id.menu_clear:
                 onMenuStyle(item.getItemId());
                 return true;
+            case R.id.menu_style_toolbar:
+                onMenuStyleToolbar();
+                return true;
             case R.id.menu_encrypt:
-                encrypt = !encrypt;
-                getActivity().invalidateOptionsMenu();
+                onMenuEncrypt();
                 return true;
             case R.id.menu_send_after:
                 onMenuSendAfter();
@@ -879,6 +889,19 @@ public class FragmentCompose extends FragmentBase {
         etBody.setSelection(end);
     }
 
+    private void onMenuStyleToolbar() {
+        style = !style;
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        prefs.edit().putBoolean("style_toolbar", style).apply();
+        getActivity().invalidateOptionsMenu();
+        edit_bar.setVisibility(style ? View.VISIBLE : View.GONE);
+    }
+
+    private void onMenuEncrypt() {
+        encrypt = !encrypt;
+        getActivity().invalidateOptionsMenu();
+    }
+
     private void onMenuSendAfter() {
         DialogDuration.show(getContext(), getViewLifecycleOwner(), R.string.title_send_at,
                 new DialogDuration.IDialogDuration() {
@@ -2310,7 +2333,7 @@ public class FragmentCompose extends FragmentBase {
                 autosave = true;
 
                 pbWait.setVisibility(View.GONE);
-                edit_bar.setVisibility(View.VISIBLE);
+                edit_bar.setVisibility(style ? View.VISIBLE : View.GONE);
                 bottom_navigation.setVisibility(View.VISIBLE);
                 Helper.setViewsEnabled(view, true);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 600975e104..ee973f5f1a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -128,7 +128,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             "notify_preview", "search_local", "light", "sound",
             "updates", "debug",
             "first", "why", "last_update_check", "app_support", "message_swipe", "message_select", "folder_actions", "folder_sync",
-            "edit_ref_confirmed", "show_html_confirmed", "show_images_confirmed", "print_html_confirmed", "show_organization"
+            "edit_ref_confirmed", "show_html_confirmed", "show_images_confirmed", "print_html_confirmed", "show_organization", "style_toolbar"
     };
 
     @Override
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 385846ea8c..9587f4fc08 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -18,6 +18,12 @@
         android:title="@string/title_style_clear"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_style_toolbar"
+        android:checkable="true"
+        android:title="@string/title_style_toolbar"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_encrypt"
         android:checkable="true"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f58c01771c..0a76c26085 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -399,6 +399,7 @@
     <string name="title_style_clear">Clear formatting</string>
     <string name="title_style_link">Insert link</string>
     <string name="title_style_image">Insert image</string>
+    <string name="title_style_toolbar">Style toolbar</string>
     <string name="title_add_attachment">Add attachment</string>
     <string name="title_show_addresses">Show CC/BCC</string>