Issue #32: Fix for Postbox and pre-Bug 413260 Thunderbird (TB2) compatibility.  Bug introduced in the anniversary changes.