diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 795dfcd..87712bf 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -822,7 +822,14 @@ static void
 action_mail_reply_all_cb (GtkAction *action,
                           EMailReader *reader)
 {
-	e_mail_reader_reply_to_message (reader, REPLY_MODE_ALL);
+	gint mode = REPLY_MODE_ALL;
+	GConfClient *gconf;
+
+	gconf = mail_config_get_gconf_client ();
+	if (gconf_client_get_bool (gconf, "/apps/evolution/mail/always_reply_list", NULL))
+		mode = REPLY_MODE_LIST;
+	
+	e_mail_reader_reply_to_message (reader, mode);
 }
 
 static void
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 5ab3e37..92e50b6 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -830,6 +830,21 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/mail/always_reply_list</key>
+      <applyto>/apps/evolution/mail/always_reply_list</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Always Reply to List</short>
+        <long>
+          Change the behaviour of the "Reply to All" action to
+	  actually reply to the list instead, where possible.
+        </long>
+      </locale>
+    </schema>
+
     <!-- Subscribe dialog -->
 
     <schema>
