diff --git a/src/conversationmanager.cpp b/src/conversationmanager.cpp
index a83803be2433979d0a050e889ec3560b41f95278..ee24ec1cb2fedbc5b454f2cf21b24b6527365dbc 100644
--- a/src/conversationmanager.cpp
+++ b/src/conversationmanager.cpp
@@ -90,6 +90,7 @@ void ConversationManager::handleMessageReceived(Swift::Message::ref message) {
 		if (!m_convs[name]) {
 			m_convs[name] = m_component->getFactory()->createConversation(this, name);
 			m_convs[name]->setRoom(room_name);
+			m_convs[name]->setNickname(name);
 		}
 	}