Thanks, that's what I've been doing since I got the replacement phone. But this is really annoying.
Had a chat with the HTC support team, they said that this is a known issue and are currently working on an update to fix it.
They said it usually takes 3 to 5 working weeks to have an update!!