Bug 938846 - [Settings] [Messaging] Fix checkbox regressions from bug #9...

...14892