Adding messages and conversations

Fix #504