Bug 70710: More expandable tags within emails - Patch by Alan Siu-Lung Tam <Tam@SiuLung.com> r=vladd a=myk