[Bug 543968] avoid feature regressions for Thunderbird