Changes to stay backwards compatible back to Thunderbird 6...