prevented escapes and added date set for mail