Scott MacGregor <mscott@mozilla.org> has granted  superreview:
Bug 257990: Integrate Junk Mail settings into "Options" and "Account Settings"
https://bugzilla.mozilla.org/show_bug.cgi?id=257990

Attachment 220151: updated fix with review comments
https://bugzilla.mozilla.org/attachment.cgi?id=220151&action=edit

------- Additional Comments from Scott MacGregor <mscott@mozilla.org>
carrying forward david's sr and neil's r.