Add support for later versions of Thunderbird