Backout 82fb9d827b24. Bug 1036345 - Send ship-it email for Thunderbird on a different address