Is there an alternative to salvagewallet that keeps account info? I am using the accounts feature of bitcoind , if a wallet gets corrupted and bitcoind is started with -salvagewallet then the account information is lost.

So, is there any built in feature that will rebuilt also my accounts ?
This could be a solution once released:

"Add -zapwallettx function, a diagnostic tool to assist in wallet repair" - https://github.com/bitcoin/bitcoin/pull/3659