From f1dc468e50d99d4c2ef3f4d90f04b693031f36cb Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Wed, 1 Apr 2026 16:37:08 +0530
Subject: [PATCH] Restore replyTo elseif logic to preserve old behavior

customMailOptions replyTo and smtp replyTo are mutually exclusive,
matching the original PHPMailer implementation.
---
 src/Appwrite/Platform/Workers/Mails.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/Mails.php b/src/Appwrite/Platform/Workers/Mails.php
index 83ddb082ab..01fe4ced9e 100644
--- a/src/Appwrite/Platform/Workers/Mails.php
+++ b/src/Appwrite/Platform/Workers/Mails.php
@@ -160,11 +160,6 @@ class Mails extends Action
         $replyTo = $defaultFromEmail;
         $replyToName = $defaultFromName;
 
-        if (!empty($smtp)) {
-            $replyTo = !empty($smtp['replyTo']) ? $smtp['replyTo'] : ($smtp['senderEmail'] ?? $replyTo);
-            $replyToName = $smtp['senderName'] ?? $replyToName;
-        }
-
         $customMailOptions = $payload['customMailOptions'] ?? [];
 
         if (!empty($customMailOptions['senderEmail'])) {
@@ -173,11 +168,13 @@ class Mails extends Action
         if (!empty($customMailOptions['senderName'])) {
             $fromName = $customMailOptions['senderName'];
         }
-        if (!empty($customMailOptions['replyToEmail'])) {
-            $replyTo = $customMailOptions['replyToEmail'];
-        }
-        if (!empty($customMailOptions['replyToName'])) {
-            $replyToName = $customMailOptions['replyToName'];
+
+        if (!empty($customMailOptions['replyToEmail']) || !empty($customMailOptions['replyToName'])) {
+            $replyTo = $customMailOptions['replyToEmail'] ?? $replyTo;
+            $replyToName = $customMailOptions['replyToName'] ?? $replyToName;
+        } elseif (!empty($smtp)) {
+            $replyTo = !empty($smtp['replyTo']) ? $smtp['replyTo'] : ($smtp['senderEmail'] ?? $replyTo);
+            $replyToName = $smtp['senderName'] ?? $replyToName;
         }
 
         $attachments = null;