Added partial messaging functionality.
Fixed some merging issues after Messaging commit.