diff --git a/src/libemail-engine/e-mail-session-utils.c b/src/libemail-engine/e-mail-session-utils.c
index 3b68269a78..446ad19bd5 100644
--- a/src/libemail-engine/e-mail-session-utils.c
+++ b/src/libemail-engine/e-mail-session-utils.c
@@ -1038,9 +1038,6 @@ mail_session_ref_origin_folder (EMailSession *session,
 	if (header_value == NULL)
 		return NULL;
 
-	if (strstr (header_value, "FORWARDED") != NULL)
-		return NULL;
-
 	/* Check that a "X-Evolution-Source-Message" header is present. */
 
 	header_name = "X-Evolution-Source-Message";
diff --git a/src/mail/e-mail-config-defaults-page.c b/src/mail/e-mail-config-defaults-page.c
index 325c821879..4da1239e5c 100644
--- a/src/mail/e-mail-config-defaults-page.c
+++ b/src/mail/e-mail-config-defaults-page.c
@@ -741,7 +741,7 @@ mail_config_defaults_page_constructed (GObject *object)
 		G_BINDING_BIDIRECTIONAL |
 		G_BINDING_SYNC_CREATE);
 
-	widget = gtk_check_button_new_with_mnemonic (_("S_ave replies in the folder of the message being replied to"));
+	widget = gtk_check_button_new_with_mnemonic (_("S_ave replies and forwards in the folder of the original message"));
 	g_object_set (widget, "xalign", 0.0, NULL);
 	gtk_widget_set_halign (widget, GTK_ALIGN_START);
 	gtk_grid_attach (GTK_GRID (container), widget, 0, 4, 2, 1);