move deliver email under completed_at touch, to avoid email to brake since the completead_at would be nil