Battery issue seems to be triggered by over charging action, and can be fixed quite easily. I learn this a couple of days ago from a thread here, which I can't find now.
There is a hidden button between the volume and power, and you can see it once you pop the back case off. With the phone...