I've got all the mail backed up raw (mbox) so if there was a better tool I could definitely use it. The issue now is that such tool would also have to check for duplicates, because I've already sent up a bunch of messages.