From 22fd596d6b9bc3cd502d081af39cc6ce0aeca9ae Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 22 Apr 2025 22:12:07 +0530
Subject: [PATCH] fix: don't override smtp

---
 .../conversation_reply_mailer_helper.rb       | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/mailers/conversation_reply_mailer_helper.rb b/app/mailers/conversation_reply_mailer_helper.rb
index 198e9f2a1..640d75166 100644
--- a/app/mailers/conversation_reply_mailer_helper.rb
+++ b/app/mailers/conversation_reply_mailer_helper.rb
@@ -3,6 +3,7 @@ module ConversationReplyMailerHelper
     @options = {
       to: to_emails,
       from: email_from,
+      sender: @channel.smtp_login,
       reply_to: email_reply_to,
       subject: mail_subject,
       message_id: custom_message_id,
@@ -42,22 +43,9 @@ module ConversationReplyMailerHelper
     @options[:delivery_method_options] = smtp_settings
   end
 
-  def base_smtp_settings(domain)
-    {
-      address: domain,
-      port: 587,
-      user_name: @channel.imap_login,
-      password: @channel.provider_config['access_token'],
-      domain: domain,
-      tls: false,
-      enable_starttls_auto: true,
-      openssl_verify_mode: 'none',
-      authentication: 'xoauth2'
-    }
-  end
-
   def set_delivery_method
-    return unless @inbox.inbox_type == 'Email' && @channel.smtp_enabled
+    return unless @inbox.email? && @channel.smtp_enabled
+    return if @channel.imap_enabled && (@inbox.channel.microsoft? || @inbox.channel.google?)
 
     smtp_settings = {
       address: @channel.smtp_address,
@@ -75,6 +63,20 @@ module ConversationReplyMailerHelper
     @options[:delivery_method_options] = smtp_settings
   end
 
+  def base_smtp_settings(domain)
+    {
+      address: domain,
+      port: 587,
+      user_name: @channel.imap_login,
+      password: @channel.provider_config['access_token'],
+      domain: domain,
+      tls: false,
+      enable_starttls_auto: true,
+      openssl_verify_mode: 'none',
+      authentication: 'xoauth2'
+    }
+  end
+
   def email_smtp_enabled
     @inbox.inbox_type == 'Email' && @channel.smtp_enabled
   end