Merging Messaging functionality and EditProfile updates