thunderbird: make this build again.