diff --git a/src/user.cpp b/src/user.cpp
index f791b992d69704d6fa5ec761aae3705b5aae1c5a..558138a24ad5232ece6461324aa9a03defc2352f 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -176,14 +176,21 @@ void User::setConnected(bool connected) {
 	updateLastActivity();
 
 	sendCurrentPresence();
+
+	if (m_connected) {
+		BOOST_FOREACH(Swift::Presence::ref &presence, m_joinedRooms) {
+			handlePresence(presence, true);
+		}
+	}
 }
 
-void User::handlePresence(Swift::Presence::ref presence) {
+void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {
 
 	int currentResourcesCount = m_presenceOracle->getAllPresence(m_jid).size();
 
 	m_conversationManager->resetResources();
 
+	LOG4CXX_INFO(logger, "PRESENCE " << presence->getFrom().toString() << " " << presence->getTo().toString());
 	if (!m_connected) {
 		// we are not connected to legacy network, so we should do it when disco#info arrive :)
 		if (m_readyForConnect == false) {
@@ -229,6 +236,13 @@ void User::handlePresence(Swift::Presence::ref presence) {
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to left room " << room);
 			onRoomLeft(room);
 
+			BOOST_FOREACH(Swift::Presence::ref &p, m_joinedRooms) {
+				if (p->getTo() == presence->getTo()) {
+					m_joinedRooms.remove(p);
+					break;
+				}
+			}
+
 			if (conv) {
 				m_conversationManager->removeConversation(conv);
 				delete conv;
@@ -241,7 +255,13 @@ void User::handlePresence(Swift::Presence::ref presence) {
 				m_readyForConnect = true;
 				onReadyToConnect();
 			}
+
 			std::string room = Buddy::JIDToLegacyName(presence->getTo());
+			std::string password = "";
+			if (presence->getPayload<Swift::MUCPayload>() != NULL) {
+				password = presence->getPayload<Swift::MUCPayload>()->getPassword() ? *presence->getPayload<Swift::MUCPayload>()->getPassword() : "";
+			}
+
 			Conversation *conv = m_conversationManager->getConversation(room);
 			if (conv != NULL) {
 				if (std::find(conv->getJIDs().begin(), conv->getJIDs().end(), presence->getFrom()) != conv->getJIDs().end()) {
@@ -251,14 +271,35 @@ void User::handlePresence(Swift::Presence::ref presence) {
 					conv->addJID(presence->getFrom());
 					conv->sendParticipants(presence->getFrom());
 				}
+
+				if (forceJoin) {
+					onRoomJoined(presence->getFrom(), room, presence->getTo().getResource(), password);
+				}
 				return;
 			}
 
-			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to join room " << room << " as " << presence->getTo().getResource());
-			std::string password = "";
-			if (presence->getPayload<Swift::MUCPayload>() != NULL) {
-				password = presence->getPayload<Swift::MUCPayload>()->getPassword() ? *presence->getPayload<Swift::MUCPayload>()->getPassword() : "";
+			bool isInJoined = false;
+			BOOST_FOREACH(Swift::Presence::ref &p, m_joinedRooms) {
+				if (p->getTo() == presence->getTo()) {
+					isInJoined = true;
+				}
+			}
+			if (!isInJoined) {
+				m_joinedRooms.push_back(presence);
 			}
+
+			if (!m_connected) {
+				LOG4CXX_INFO(logger, m_jid.toString() << ": Joining room " << room << " postponed, because use is not connected to legacy network yet.");
+				return;
+			}
+
+			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to join room " << room << " as " << presence->getTo().getResource());
+
+			conv = m_component->getFactory()->createConversation(m_conversationManager, room, true);
+			m_conversationManager->addConversation(conv);
+			conv->setNickname(presence->getTo().getResource());
+			conv->addJID(presence->getFrom());
+
 			onRoomJoined(presence->getFrom(), room, presence->getTo().getResource(), password);
 		}
 		return;