One more hotfix...

...to make sure we're compatible with Thunderbird 17 and the latest
trunk. This compatibility story is ruining my life.
And this is 2.6.3...