Fixed from address and set reply-to address
Merge branch 'master' into production

* master:
  Fixed from address and set reply-to address