Can't get sending mails use the correct sender

[joebordes]

can you please try this change and let me know if it works better:

Code:

diff --git a/modules/Emails/Emails.php b/modules/Emails/Emails.php

index 547316742..d924a746f 100644
--- a/modules/Emails/Emails.php
+++ b/modules/Emails/Emails.php
@@ -304,7 +304,7 @@ class Emails extends CRMEntity {
                }
                // mailscanner customization: If Support Reply To is defined use it.
                $HELPDESK_SUPPORT_EMAIL_REPLY_ID = GlobalVariable::getVariable('HelpDesk_Support_Reply_EMail', $replyto, 'HelpDesk');
-               if ($HELPDESK_SUPPORT_EMAIL_REPLY_ID && $replyto != $HELPDESK_SUPPORT_EMAIL_REPLY_ID) {
+               if (empty($replyToEmail) && $HELPDESK_SUPPORT_EMAIL_REPLY_ID && $replyto != $HELPDESK_SUPPORT_EMAIL_REPLY_ID) {
                        $mail->AddReplyTo($HELPDESK_SUPPORT_EMAIL_REPLY_ID);
                }
                $mail_status = MailSend($mail);