They are going to start taking delivery of new 747-400s in 2007 and have a total of 8-12 on order with more to follow. Still getting MD-11s converted and will end up with about 30.
My guess is they will dump the Airbus 380 and say they are getting more 747s and or 777s within a short time.