Added messages functionality
Merged branch comments_preview