diff --git a/src/conversationmanager.cpp b/src/conversationmanager.cpp
index e2f7f74936376c92b8a44d91792dbb81ae29aebb..5b3ba62d414bcb44b1f54a438fa597d82286458e 100644
--- a/src/conversationmanager.cpp
+++ b/src/conversationmanager.cpp
@@ -63,10 +63,11 @@ void ConversationManager::removeConversation(Conversation *conv) {
 }
 
 void ConversationManager::handleMessageReceived(Swift::Message::ref message) {
-	std::string name = message->getTo().getUnescapedNode();
-	if (name.find_last_of("%") != std::string::npos) {
-		name.replace(name.find_last_of("%"), 1, "@");
-	}
+// 	std::string name = message->getTo().getUnescapedNode();
+// 	if (name.find_last_of("%") != std::string::npos) { // OK when commented
+// 		name.replace(name.find_last_of("%"), 1, "@"); // OK when commented
+// 	}
+	std::string name = Buddy::JIDToLegacyName(message->getTo());
 
 	// create conversation if it does not exist.
 	if (!m_convs[name]) {