Merge messages_ui branch

@rduecyg: Is this good to go? You said you had pushed it up over Campfire but wasn't sure.

Once I get the greenlight I'll merge and push.