X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=ang%2FcrmMailing%2FFromAddress.js;h=aae6499f1c33d0072906ba3ea3a9547533d244dd;hb=ee9f177dcd835bcdff2e3c2d34dd38e9eedc3526;hp=2718ea0aa10610d37a3a7725155e1bf6c5ebaed0;hpb=60b5135b495b3e887047459feed13762a5ff937d;p=civicrm-core.git

diff --git a/ang/crmMailing/FromAddress.js b/ang/crmMailing/FromAddress.js
index 2718ea0aa1..aae6499f1c 100644
--- a/ang/crmMailing/FromAddress.js
+++ b/ang/crmMailing/FromAddress.js
@@ -18,7 +18,10 @@
           var addr = crmFromAddresses.getByLabel(newValue);
           mailing.from_name = addr.author;
           mailing.from_email = addr.email;
-          mailing.replyto_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?
       }