More work on defer emails