I have the same problem and have around 15GB of e-mails I'm archiving, but I am slightly relieved by the fact that IMAP client display them correctly, as this means the data is all still there, if only GMail would display it correctly too.

Maybe we just all need to pester the GMail developers to get this looked at?