iPhone Battery Issue with ActiveSync after Firmware 2.2

I have a 1st generation iPhone (non 3G).  After upgrading to the 2.2 firmware my battery drained like crazy.  Got maybe 6 hours in standby mode, which is ridiculous.  As it turns out, there's some issue with ActiveSync.  I use ActiveSync for my work Exchange email.  After the upgrade ActiveSync was basically on all the time, draining the battery.  Must have been some problem with the push notification.  Ended up deleting the mail account and re-added it.  This seems to have fixed the problem.  Standby time is back to normal.