diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 306a01e16b..2c0f4aae7e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1955,6 +1955,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         boolean has = false;
                         ConversationActions cactions = args.getParcelable("actions");
                         if (cactions != null) {
+                            LinearLayout.LayoutParams lparam = new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
+
                             List<ConversationAction> actions = cactions.getConversationActions();
                             for (ConversationAction action : actions) {
                                 final RemoteAction raction = action.getAction();
@@ -1964,7 +1966,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                                 Button button = new Button(context, null, android.R.attr.buttonStyleSmall);
                                 button.setId(View.generateViewId());
-                                button.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
+                                button.setLayoutParams(lparam);
                                 button.setText(title);
                                 button.setOnClickListener(new View.OnClickListener() {
                                     @Override
diff --git a/app/src/main/res/layout/include_message_action.xml b/app/src/main/res/layout/include_message_action.xml
index eee9ea17cf..b98e1e49cf 100644
--- a/app/src/main/res/layout/include_message_action.xml
+++ b/app/src/main/res/layout/include_message_action.xml
@@ -33,9 +33,11 @@
         android:id="@+id/flow"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
         app:flow_horizontalBias="0"
         app:flow_horizontalGap="6dp"
         app:flow_horizontalStyle="packed"
+        app:flow_verticalGap="6dp"
         app:flow_wrapMode="chain"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"