Well, after a whole day pretty much of tweaking I may have taken care of the problem.

The default yahoo e-mail configuration has the "free-nokia" extension at the beginning of it. I assume that is for Ovi Mail??

That has cured my battery drain issue and both my e-mail accounts are now working as "other mail account".