Refine deferred sending handling