From 8449eade95ae8789fc4a84d9058528c106963104 Mon Sep 17 00:00:00 2001
From: Benedek Farkas <benedek.farkas@lombiq.com>
Date: Mon, 11 Mar 2024 14:28:13 +0100
Subject: [PATCH] SmtpMessageChannel: Fixing that the "reply to" address should
 fall back to site settings if not provided in the current email

---
 .../Modules/Orchard.Email/Services/SmtpMessageChannel.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
index 3c8a3ccbc41..a4c7668e788 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
@@ -121,9 +121,9 @@ public void Process(IDictionary<string, object> parameters) {
                 fromAddress.Name = string.IsNullOrWhiteSpace(emailMessage.FromName) ? _smtpSettings.FromName : emailMessage.FromName;
                 mailMessage.From.Add(fromAddress);
 
-                if (!String.IsNullOrWhiteSpace(emailMessage.ReplyTo)) {
-                    mailMessage.ReplyTo.AddRange(ParseRecipients(emailMessage.ReplyTo));
-                }
+                mailMessage.ReplyTo.AddRange(ParseRecipients(string.IsNullOrWhiteSpace(emailMessage.ReplyTo)
+                    ? _smtpSettings.ReplyTo
+                    : emailMessage.ReplyTo));
 
                 if (emailMessage.NotifyReadEmail) {
                     mailMessage.Headers.Add("Disposition-Notification-To", mailMessage.From.ToString());