By the way, 'when will you come?' is correct grammar but strange..
is there a plan to come already? : 'When are you coming?' or
do you want a decision : 'when are you going to come?'
In future time expressions, like 'when I..' or 'if I ..' just use the present, without 'will'.