Yeah since WP7 going to be delayed until 2011 for Sprint I got to get 2 new batteries for me and the wife. Our's have not been keeping their charge for very long at all..
Make sure you also find out the AH value for the battery you may want to buy on Ebay or other sites. There is a lot of stuff from China which has a lower ratings that will hold less power than original equipment.