I would think the sentence 'It won't take long until I graduate' is good English though before is more commonly used. Am I right?