Display messages in profile feeds
Fix merging conflicts