From 2426577a914af7e0de906620b1f9fda3af48bc8a Mon Sep 17 00:00:00 2001
From: helloworldstack <66512512+helloworldstack@users.noreply.github.com>
Date: Sat, 19 Feb 2022 02:43:42 +0700
Subject: [PATCH] Fix sign in token and warning emails failed to send in some
 cases (#17589)

---
 app/mailers/user_mailer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 583c948b0e..1a823328c4 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -169,7 +169,7 @@ class UserMailer < Devise::Mailer
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email,
            subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}"),
-           reply_to: Setting.site_contact_email
+           reply_to: ENV['SMTP_REPLY_TO']
     end
   end
 
@@ -206,7 +206,7 @@ class UserMailer < Devise::Mailer
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email,
            subject: I18n.t('user_mailer.sign_in_token.subject'),
-           reply_to: Setting.site_contact_email
+           reply_to: ENV['SMTP_REPLY_TO']
     end
   end
 end