Backed out changeset 42a96b98eeec (bug 925871) for Mozmill failures.
Bug 842632, part 1: Distinguish between building address strings for display or MIME, r=IanN, sr=Neil.

Even though seamonkey is a CLOSED TREE.

--HG--
extra : amend_source : af960b16b0cb922faf08059afa172af938ccc28f