Mmullin's Thunderbird bug fixing

Patch Here

Comments Too many lines though

Bug filed @
http://landfill.bugzilla.org/bugzilla-3.0-branch/show_bug.cgi?id=6008