diff --git a/src/conversation.cpp b/src/conversation.cpp
index e80c552d48d6d66b7d6e2aecf555a89faa63a634..c4cc2e21146c35abc9aaf341244e7c797e86f957 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -59,7 +59,7 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 				message->setFrom(buddy->getJID());
 			}
 			else {
-				message->setFrom(Swift::JID(Swift::JID::getEscapedNode(nickname), m_conversationManager->getComponent()->getJID().toBare()));
+				message->setFrom(Swift::JID(Swift::JID::getEscapedNode(m_legacyName), m_conversationManager->getComponent()->getJID().toBare()));
 			}
 		}
 		// PM message