Bug 942107 - Messages app, Reduce locators
Merge pull request #14215 from viorelaioia/bug_942107

Bug 942107 - Messages app, Reduce locators