need help with the sentence
He told me that he will/would visit them when he returns/returned from China
I think the correct variant is:
He told me that he would visit them when he returns from China
The fist part, I believe, is future in the past, but I'm not certain about the last part (he returns from China) , probably bc can't find grammar explanation.
Thanks in advance for your answers