diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6bde9b6395..aa37544dea 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -702,7 +702,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (values.containsKey("expanded") && values.get("expanded").size() > 0) {
                     long id = values.get("expanded").get(0);
                     Intent reply = new Intent(getContext(), ActivityCompose.class)
-                            .putExtra("action", "reply")
+                            .putExtra("action", "reply_all")
                             .putExtra("reference", id);
                     startActivity(reply);
                 }
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index b96eb7f0c9..3510796559 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -185,7 +185,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|bottom"
                 android:layout_margin="@dimen/fab_padding"
-                android:src="@drawable/baseline_reply_24"
+                android:src="@drawable/baseline_reply_all_24"
                 android:tint="@color/colorActionForeground"
                 app:layout_constraintBottom_toTopOf="@+id/seekBar"
                 app:layout_constraintEnd_toEndOf="parent" />