This is something that, I hate to say, will probably take a law to fix. Companies in general have shown a resistance to understanding why this is a problem (even when well intentioned).
I would actually probably use that.
and
and use Postbox as my mail client. All great so far and only costs a few £'s a month. Probably less than lunch for a day or two.