Bustage fix: uplift bugs 883927 and 883866 for thunderbird. r=bustage
Merge heads