Fix Thunderbird windows bustage due to bug 837568 by doing the Thunderbird part of the port of bug 808785. r=bustage fix for CLOSED TREE