diff --git a/src/conversation.cpp b/src/conversation.cpp
index 571a4cde..f599c852 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -84,8 +84,13 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 		if (legacyName.find_last_of("@") != std::string::npos) {
 			legacyName.replace(legacyName.find_last_of("@"), 1, "%"); // OK
 		}
+
+		std::string n = nickname;
+		if (n.empty()) {
+			n = " ";
+		}
 		message->setTo(m_jid);
-		message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), nickname));
+		message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), n));
 		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
 	}
 }