Probably this autumn/winter!
I picked up a set of teardrop mirrors off an '04 Leon recently, along with a mint set of gloss black covers, so I fitted them this morning:
http://i312.photobucket.com/albums/ll330/SonicBlueLeon/mirrors1.jpg
They seem way better made than the old mirrors, chunky and robust, my old squarer-shaped ones feel quite flimsy by comparison. The new ones are a much nicer shape, more modern looking.
Electricaly fold in?
My old ones did too, these new ones plugged straight in with the same wiring so I'm guessing they're heated too.