MessageActivity fixed, first version