extra/thunderbird fixes