WIP Messaging feature - Resolve issues