Updated for Thunderbird 31