Merge "fix text sizing inaccuracy from 980px switch" into ub-mail-master