Uninstalled catorize - had no idea it could cause battery issues until I read the forums - and battery life significantly improved.

Here's a battery graph from yesterday, just for reference. With no use and internet connection off your phone shouldn't use more than 10-15% of battery per 24 hours. (I guess?) I bought my phone when N900 came out, 15 months ago or so, and it's been in heavy use ever since. I'm quite happy with how well the battery still performs.

(The little notch there is from actual phone use.)