Nokia Nseries :: 5800XM Bluetooth Power Bug?

I've been experiencing poor battery life on my Nokia 5800 XM recently. Sometimes on a full charge I could only get a day to a day and a half of standby time with minimal usage (2-3 texts, no calls and 5 photographs). I put this down to an old battery and ordered a new one.In the meantime we went to my parents-in-law and the battery lasted 5 days on a full charge including a reasonable amount of web browsing via WLAN.Got back home and the battery died a couple of days later despite being fully charged.

Put in a brand new battery, charged it up and used the phone - 2.5 days later it was dead (minimal texts and a couple of photos). Charged it again - 2 days standby before dead.Downloaded the power profile app - everything seemed to be fine. The phone idled nicely on standby with minimal power drain.Then I used the bluetooth and everything became clear. After connecting to OVI for a minute or two, downloading my photos then closing OVI and disabling the bluetooth on the phone, I noticed my power consumption didn't go back down. I was getting regular peaks of around 150ma and the battery life was considerably reduced.

If I left the bluetooth disabled and power cycled the phone, it would settle down to minimal usage. The moment bluetooth was enabled, the problem reocurred.I then backed the phone up, totally wiped the sd card and reinstalled from scratch.Exactly the same problem - fine until BT enabled then even when disabled, the phone started drawing excess current on idle.