Search:

Hanna,

Well, both examples are correct, using both tenses (I've consulted with a native speaker :-) ).
Have a look at this one, for instance (concerning an action in the future)
- "As soon as...

Как только я выучу русский, я поеду в Россию = As soon as I learn Russian, I'll go to Russia.
Я удивлён! И как (только) ему удаётся говорить на 5 языках?! - I'm amazed! How does he manage to speak...