Update mails as per delivery.
Fixed up local variables to the correct names.
Merge branch 'feature/mails' into develop

* feature/mails:
  Fixed up local variables to the correct names.
  Update mails as per delivery.