diff --git a/src/conversation.cpp b/src/conversation.cpp
index f610546131b596b6d51b683c113b6f58cb5ea086..9cd8f7391a936c1ef87e9fe3e8cb86464317e71e 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -33,6 +33,7 @@ Conversation::Conversation(ConversationManager *conversationManager, const std::
 // 	m_conversationManager->addConversation(this);
 	m_muc = isMUC;
 	m_jid = m_conversationManager->getUser()->getJID().toBare();
+	m_sentInitialPresence = false;
 }
 
 Conversation::~Conversation() {
@@ -91,7 +92,17 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 				message->setFrom(buddy->getJID());
 			}
 			else {
-				message->setFrom(Swift::JID(Swift::JID::getEscapedNode(m_legacyName), m_conversationManager->getComponent()->getJID().toBare()));
+				std::string name = m_legacyName;
+				if (CONFIG_BOOL_DEFAULTED(m_conversationManager->getComponent()->getConfig(), "service.jid_escaping", true)) {
+					name = Swift::JID::getEscapedNode(m_legacyName);
+				}
+				else {
+					if (name.find_last_of("@") != std::string::npos) {
+						name.replace(name.find_last_of("@"), 1, "%");
+					}
+				}
+
+				message->setFrom(Swift::JID(name, m_conversationManager->getComponent()->getJID().toBare(), "bot"));
 			}
 		}
 		// PM message
@@ -118,6 +129,11 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 		BOOST_FOREACH(const Swift::JID &jid, m_jids) {
 			message->setTo(jid);
 			message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), n));
+			// Subject has to be sent after our own presence (the one with code 110)
+			if (!message->getSubject().empty() && m_sentInitialPresence == false) {
+				m_subject = message;
+				return;
+			}
 			m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
 		}
 	}
@@ -159,6 +175,7 @@ Swift::Presence::ref Conversation::generatePresence(const std::string &nick, int
 		Swift::MUCUserPayload::StatusCode c;
 		c.code = 110;
 		p->addStatusCode(c);
+		m_sentInitialPresence = true;
 	}
 
 	
@@ -207,6 +224,11 @@ void Conversation::handleParticipantChanged(const std::string &nick, int flag, i
 	if (!newname.empty()) {
 		handleParticipantChanged(newname, flag, status, statusMessage);
 	}
+
+	if (m_sentInitialPresence && m_subject) {
+		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(m_subject);
+		m_subject.reset();
+	}
 }
 
 }