diff --git a/app/lib/server/functions/notifications/email.js b/app/lib/server/functions/notifications/email.js
index 2cf06ed1277c0..d49bf1c44a1f1 100644
--- a/app/lib/server/functions/notifications/email.js
+++ b/app/lib/server/functions/notifications/email.js
@@ -160,7 +160,7 @@ export function getEmailData({
 		headers: {},
 	};
 
-	if (sender.emails?.length > 0) {
+	if (sender.emails?.length > 0 && settings.get('Add_Sender_To_ReplyTo')) {
 		const [senderEmail] = sender.emails;
 		email.headers['Reply-To'] = generateNameEmail(username, senderEmail.address);
 	}
diff --git a/app/lib/server/startup/email.js b/app/lib/server/startup/email.js
index 86139254417fc..40cac50e9c8bf 100644
--- a/app/lib/server/startup/email.js
+++ b/app/lib/server/startup/email.js
@@ -476,5 +476,8 @@ settings.addGroup('Email', function() {
 			type: 'boolean',
 			public: true,
 		});
+		this.add('Add_Sender_To_ReplyTo', false, {
+			type: 'boolean',
+		});
 	});
 });
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index ac89625b91f1c..4998bba07e1f2 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -257,6 +257,7 @@
   "Add_monitor": "Add monitor",
   "Add_Reaction": "Add Reaction",
   "Add_Role": "Add Role",
+  "Add_Sender_To_ReplyTo": "Add Sender to Reply-To",
   "Add_user": "Add user",
   "Add_User": "Add User",
   "Add_users": "Add users",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index e0fbbd1ea59cc..e50ddf1dca2df 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -235,6 +235,7 @@
   "Add_monitor": "Adicionar Monitor",
   "Add_Reaction": "Adicionar reação",
   "Add_Role": "Adicionar Role",
+  "Add_Sender_To_ReplyTo": "Adicionar Remetente ao campo \"Responder para\"",
   "Add_user": "Adicionar usuário",
   "Add_User": "Adicionar Usuário",
   "Add_users": "Adicionar usuários",
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index db36616f90398..323268b8342bc 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -230,6 +230,7 @@
   "Add_files_from": "Adicionar arquivos de",
   "Add_manager": "Adicionar gerente",
   "Add_Role": "Adicionar função",
+  "Add_Sender_To_ReplyTo": "Adicionar Remetente ao campo \"Responder a\"",
   "Add_user": "Adicionar utilizador",
   "Add_User": "Adicionar Utilizador",
   "Add_users": "Adicionar utilizadores",