Patch done, needs to be submitted to upstream. Blocked by T3048.
Patch submitted
Patch improved & submitted
Patch was accepted into Enigmail: 5e39a44f17f9ef45fd04d3069ba5d6f3092e28d6