Is it that difficult to re-add the POP/IMAP accounts? Usually I just backup the PST and re add the account. You just specify the old PST as the data file when you readd the account, and it won't download the emails again.