@Vanaleck I'd actually guess that'll be quite a while away. There's a lot of misunderstanding material they can still squeeze out of him not knowing she's pretending to be her brother.
It'd be a pleasant surprise if they skipped that trope-filled path though, but I don't hold high hopes for it :P