Bug 1097421 - [email] Upgrade email.js omnibus bug. r=jrburke

Land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/353
See its individual commit comments and the bugs dependent on bug 1097421
for more info.