Record delivery id correctly in fragmented and non-fragmented cases