Check out PokerOffice (www.pokeroffice.com), they have just released version 2 and it seems to be the deal (still I'm using version 1). They have a deal so you get it for free if you sign up at Empire Poker and Noble Poker...
I checked out the new features and I just had to download pokeroffice 2 (they have a 300 hands limit version for testing), at a first glance it looks VERY GOOD!! I guess I'll give myself an early x-mas gift this year...