diff --git a/include/transport/user.h b/include/transport/user.h
index 11c253b046c33c60b2e06a5f996eb782aab34212..1719b13db155e5f2552ae935b23be15a6bc30784 100644
--- a/include/transport/user.h
+++ b/include/transport/user.h
@@ -71,12 +71,14 @@ class User : public Swift::EntityCapsProvider {
 
 		Component *getComponent() { return m_component; }
 
+		UserManager *getUserManager() { return m_userManager; }
+
 		void setData(void *data) { m_data = data; }
 		void *getData() { return m_data; }
 
 		/// Handles presence from XMPP JID associated with this user.
 		/// \param presence Swift::Presence.
-		void handlePresence(Swift::Presence::ref presence);
+		void handlePresence(Swift::Presence::ref presence, bool forceJoin = false);
 
 		void handleSubscription(Swift::Presence::ref presence);
 
@@ -142,6 +144,7 @@ class User : public Swift::EntityCapsProvider {
 		std::vector<boost::shared_ptr<Swift::OutgoingFileTransfer> > m_filetransfers;
 		int m_resources;
 		int m_reconnectCounter;
+		std::list<Swift::Presence::ref> m_joinedRooms;
 };
 
 }