Bug 942107 - Messages app, Reduce locators

I removed only one locator :( I also tried to modify a locator from NewMessage section (replace _thread_messages_locator ), but I couldn't find another condition as good as that. I believe the other locators are important and we should keep them.
If you guys have any suggestions, please let me know. Thanks!