#2 is correct. There is what I imagine to be an unintentional deletion in #1, which should read: Until a cure has been found.... or Up to the time that a cure.....
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.