Bug 1052951 - [email] signature upgrade experience
Merge pull request #23452 from jrburke/bug1052951-email-sig-upgrade

Bug 1052951 - [email] signature upgrade experience r=asuth