Hello all! I am using an iPhone 3G but I want to upgrade because 3G is getting old. I am renewing my contract with Vodafone too, so I'll get a subsidy. Should I buy iPhone 4 or wait for the next one on June? #1 in my mind: A5 and bigger screen. Please advised me. Thanx in advance!