diff --git a/src/usersreconnecter.cpp b/src/usersreconnecter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0ba66afb3914f6ca58a6a9597907554b7dfc99f7
--- /dev/null
+++ b/src/usersreconnecter.cpp
@@ -0,0 +1,89 @@
+/**
+ * XMPP - libpurple transport
+ *
+ * Copyright (C) 2009, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "transport/usersreconnecter.h"
+
+#include <iostream>
+#include <boost/bind.hpp>
+#include "Swiften/Queries/IQRouter.h"
+#include "Swiften/Swiften.h"
+#include "transport/storagebackend.h"
+#include "transport/transport.h"
+#include "log4cxx/logger.h"
+
+using namespace log4cxx;
+
+using namespace Swift;
+using namespace boost;
+
+namespace Transport {
+
+static LoggerPtr logger = Logger::getLogger("UserReconnecter");
+
+UsersReconnecter::UsersReconnecter(Component *component, StorageBackend *storageBackend) {
+	m_component = component;
+	m_storageBackend = storageBackend;
+	m_started = false;
+
+	m_nextUserTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(1000);
+	m_nextUserTimer->onTick.connect(boost::bind(&UsersReconnecter::reconnectNextUser, this));
+
+	m_component->onConnected.connect(bind(&UsersReconnecter::handleConnected, this));
+}
+
+UsersReconnecter::~UsersReconnecter() {
+	m_component->onConnected.disconnect(bind(&UsersReconnecter::handleConnected, this));
+	m_nextUserTimer->stop();
+	m_nextUserTimer->onTick.disconnect(boost::bind(&UsersReconnecter::reconnectNextUser, this));
+}
+
+void UsersReconnecter::reconnectNextUser() {
+	if (m_users.empty()) {
+		LOG4CXX_INFO(logger, "All users reconnected, stopping UserReconnecter.");
+		return;
+	}
+
+	std::string user = m_users.back();
+	m_users.pop_back();
+
+	LOG4CXX_INFO(logger, "Sending probe presence to " << user);
+	Swift::Presence::ref response = Swift::Presence::create();
+	response->setTo(user);
+	response->setFrom(m_component->getJID());
+	response->setType(Swift::Presence::Probe);
+
+	m_component->getStanzaChannel()->sendPresence(response);
+	m_nextUserTimer->start();
+}
+
+void UsersReconnecter::handleConnected() {
+	if (m_started)
+		return;
+
+	LOG4CXX_INFO(logger, "Starting UserReconnecter.");
+	m_started = true;
+
+	m_storageBackend->getOnlineUsers(m_users);
+
+	reconnectNextUser();
+}
+
+
+}