[Phone_Tank]

I was running into the same issue with 2.1 on my Moment after the upgrade. On 1.5 I had it set so the wireless always stays connected even when the phone is in sleep mode instead of connecting and reconnecting every time I hit the end button or the phone went to sleep mode.

Once I set the wireless connection to stay on all the time (I'm always around wireless at home and work) my battery life had a dramatic increase. I may just be loosing mind but it seemed to work for me...