diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index c24b9d58cb..a1081f5ed5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -112,6 +112,7 @@ public class FragmentCompose extends FragmentEx {
     private Group grpAddresses;
     private Group grpAttachments;
     private Group grpMessage;
+    private Group grpAction;
 
     private AdapterAttachment adapter;
 
@@ -147,6 +148,7 @@ public class FragmentCompose extends FragmentEx {
         grpAddresses = view.findViewById(R.id.grpAddresses);
         grpAttachments = view.findViewById(R.id.grpAttachments);
         grpMessage = view.findViewById(R.id.grpMessage);
+        grpAction = view.findViewById(R.id.grpAction);
 
         // Wire controls
 
@@ -199,6 +201,7 @@ public class FragmentCompose extends FragmentEx {
                     addresses = (grpAddresses.getVisibility() != View.GONE);
                     grpAddresses.setVisibility(View.GONE);
                     grpAttachments.setVisibility(View.GONE);
+                    grpAction.setVisibility(View.VISIBLE);
                 }
             }
         });
@@ -217,6 +220,7 @@ public class FragmentCompose extends FragmentEx {
                                     grpAddresses.setVisibility(View.VISIBLE);
                                 if (rvAttachment.getAdapter().getItemCount() > 0)
                                     grpAttachments.setVisibility(View.VISIBLE);
+                                grpAction.setVisibility(View.GONE);
 
                                 new Handler().post(new Runnable() {
                                     @Override
@@ -284,6 +288,7 @@ public class FragmentCompose extends FragmentEx {
         grpAddresses.setVisibility(View.GONE);
         grpAttachments.setVisibility(View.GONE);
         grpMessage.setVisibility(View.GONE);
+        grpAction.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
 
         getActivity().invalidateOptionsMenu();
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 41d5d36032..0c1e08eda4 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -235,5 +235,11 @@
         android:id="@+id/grpMessage"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:constraint_referenced_ids="scroll,ibBold,ibItalic,bottom_navigation" />
+        app:constraint_referenced_ids="scroll,bottom_navigation" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpAction"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="ibBold,ibItalic" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file