Merge pull request #2762 from pyhalov/thunderbird