I was having major issues with battery drain on 2.1 (second leak) and after reading some threads here I removed the HTC battery widget. This appears to have solved the problem. Apparently the phone was not going to sleep when I had the HTC widget running. The awake time was nearly what the up time was. Without the HTC widget I do not have this issue. Has anyone ran the Android Battery Widget on 2.1 and does it create the same problem? Thanks!