X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=ang%2FcrmMailing%2FFromAddress.js;h=aae6499f1c33d0072906ba3ea3a9547533d244dd;hb=706bfa238a9f64e031a56235b304b0d2e9cd982f;hp=9034da6a22df66f6b602999d086ff8779e83215d;hpb=493320d761d52dab8db1233bd2ffe3c61aac171f;p=civicrm-core.git

diff --git a/ang/crmMailing/FromAddress.js b/ang/crmMailing/FromAddress.js
index 9034da6a22..aae6499f1c 100644
--- a/ang/crmMailing/FromAddress.js
+++ b/ang/crmMailing/FromAddress.js
@@ -18,6 +18,10 @@
           var addr = crmFromAddresses.getByLabel(newValue);
           mailing.from_name = addr.author;
           mailing.from_email = addr.email;
+          // CRM-18364: set replyTo as from_email only if custom replyTo is disabled in mail settings.
+          if (!CRM.crmMailing.enableReplyTo) {
+            mailing.replyto_email = crmFromAddresses.getByAuthorEmail(mailing.from_name, mailing.from_email, true).label;
+          }
         });
         // FIXME: Shouldn't we also be watching mailing.from_name and mailing.from_email?
       }