WIP: Making the message list to be single view