Updated to save changes before sending email.