I'm fairly sure my patches did not address the core issue of pkg/57158, which I discovered too late (since my mail doesn't sync properly). If it turns out that it didn't, someone should revert (or keep) them, I can only look at this in 9 hours or so.