Dispatch/Cancel email notification changes