I relented, and went back to Thunderbird (it's been a while, new version, etc.), and it promptly ate some of my emails again.
So, looking for alternatives. I came upon Claws (under evaluation), and then Spicebird.
My first impression is, it really really resembles Thunderbird. I wonder if it duplicates the bugs in Thunderbird.