Bug 838011 - Add email address to contacts. r=asuth, alberto, a=leo+

https://bugzilla.mozilla.org/show_bug.cgi?id=838011