Updated with Messaging Activity