Changed remaining chunks logic for move messages retries