Fix save method when mail deferred