Saving email is sent and bug fixes