diff --git a/src/storageresponder.cpp b/src/storageresponder.cpp
new file mode 100644
index 00000000..b20ee231
--- /dev/null
+++ b/src/storageresponder.cpp
@@ -0,0 +1,57 @@
+/**
+ * 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 "storageresponder.h"
+
+#include <iostream>
+#include <boost/bind.hpp>
+#include "Swiften/Queries/IQRouter.h"
+#include "Swiften/Swiften.h"
+#include "transport/usermanager.h"
+#include "transport/user.h"
+
+using namespace Swift;
+using namespace boost;
+
+namespace Transport {
+
+StorageResponder::StorageResponder(Swift::IQRouter *router, StorageBackend *storageBackend, UserManager *userManager) : Swift::GetResponder<PrivateStorage>(router) {
+	m_storageBackend = storageBackend;
+	m_userManager = userManager;
+}
+
+StorageResponder::~StorageResponder() {
+}
+
+bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::PrivateStorage> payload) {
+	User *user = m_userManager->getUser(from.toBare().toString());
+	if (!user) {
+		sendResponse(from, id, boost::shared_ptr<PrivateStorage>(new PrivateStorage()));
+		return true;
+	}
+
+	int type = 0;
+	std::string value = "";
+	m_storageBackend->getUserSetting(user->getUserInfo().id, "storage", type, value);
+	sendResponse(from, id, boost::shared_ptr<PrivateStorage>(new PrivateStorage()));
+	return true;
+}
+
+}
diff --git a/src/storageresponder.h b/src/storageresponder.h
new file mode 100644
index 00000000..9815e02a
--- /dev/null
+++ b/src/storageresponder.h
@@ -0,0 +1,44 @@
+/**
+ * libtransport -- C++ library for easy XMPP Transports development
+ *
+ * Copyright (C) 2011, Jan Kaluza <hanzz.k@gmail.com>
+ *
+ * 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
+ */
+
+#pragma once
+
+#include <vector>
+#include "Swiften/Swiften.h"
+#include "Swiften/Queries/GetResponder.h"
+#include "Swiften/Elements/RosterPayload.h"
+
+namespace Transport {
+
+class StorageBackend;
+class UserManager;
+
+class StorageResponder : public Swift::GetResponder<Swift::PrivateStorage> {
+	public:
+		StorageResponder(Swift::IQRouter *router, StorageBackend *storageBackend, UserManager *userManager);
+		~StorageResponder();
+
+	private:
+		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::PrivateStorage> payload);
+		StorageBackend *m_storageBackend;
+		UserManager *m_userManager;
+};
+
+}
\ No newline at end of file