Bug 961637 - [email/UI] Quick advance regressed envelope display
Bug 964768:  Fix opus file names in json files.
Merge pull request #15745 from jrburke/bug961637-email-advance-envelope

Bug 961637 - [email/UI] Quick advance regressed envelope display r=asuth
Merge pull request #15774 from wanderview/opus-json

Bug 964768:  Fix opus file names in json files. r=fabrice r=21