Added beginnings of message viewing