Added ability to skip sending email