Bug 1001285 - [meta] [Settings] Messaging Settings UX update

Please remember to fix the nit. +1: