Changes to send mail when we receive request