Better handling of cancelled/saved emails