Fix Mozilla Thunderbird compatibility