Merge pull request #8555 from pivanov/bug-845061

Bug 845061 - Mail Settings Layout and Type Updates
Revert "Merge pull request #8941 from borjasalguero/bug_thread_id_rebased"

This reverts commit 86a79ba3fdfb0eb6f593e34887fa89e3553d1a66, reversing
changes made to a268ae3521516a8992fcaf17402ef2cac5ea2bd7 because Bug 850127 got
backed out of the b2g18 branch.
Bug 838012 - [E-Mail][User Story] E-Mail drafts (local only). r=jrburke a=blocking-b2g=leo+
Merge pull request #9027 from asutherland/email-local-drafts

Bug 838012 - [E-Mail][User Story] E-Mail drafts (local only). r=jrburke a=blocking-b2g=leo+
Merge pull request #8136 from pivanov/bug-840988

Bug 840988 - Revise Email Bottom Tool Bars. r=asuth