diff --git a/src/conversation.cpp b/src/conversation.cpp
index 601ce907ea3cbdf9572f024cf7b6959fb2af4175..e80c552d48d6d66b7d6e2aecf555a89faa63a634 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -59,11 +59,7 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 				message->setFrom(buddy->getJID());
 			}
 			else {
-				std::string name = nickname;
-				if (name.find_last_of("@") != std::string::npos) {
-					name.replace(name.find_last_of("@"), 1, "%");
-				}
-				message->setFrom(name);
+				message->setFrom(Swift::JID(Swift::JID::getEscapedNode(nickname), m_conversationManager->getComponent()->getJID().toBare()));
 			}
 		}
 		// PM message