Preserve message properties when retrying