diff --git a/spectrum/src/frontends/xmpp/vcardresponder.h b/spectrum/src/frontends/xmpp/vcardresponder.h
new file mode 100644
index 0000000000000000000000000000000000000000..852500e2f898eac0e1f3af4ab11fac00666ce2ba
--- /dev/null
+++ b/spectrum/src/frontends/xmpp/vcardresponder.h
@@ -0,0 +1,64 @@
+/**
+ * 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/Queries/Responder.h"
+#include "Swiften/Elements/VCard.h"
+#include "Swiften/Network/NetworkFactories.h"
+#include "Swiften/Network/Timer.h"
+#include <boost/signal.hpp>
+
+namespace Transport {
+
+class StorageBackend;
+class UserManager;
+class User;
+
+class VCardResponder : public Swift::Responder<Swift::VCard> {
+	public:
+		VCardResponder(Swift::IQRouter *router, Swift::NetworkFactories *factories, UserManager *userManager);
+		~VCardResponder();
+
+		void sendVCard(unsigned int id, boost::shared_ptr<Swift::VCard> vcard);
+
+		boost::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
+		boost::signal<void (User *, boost::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
+
+		void collectTimeouted();
+
+	private:
+		struct VCardData {
+			Swift::JID from;
+			Swift::JID to;
+			std::string id;
+			time_t received;
+		};
+
+		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::VCard> payload);
+		virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::VCard> payload);
+		UserManager *m_userManager;
+		std::map<unsigned int, VCardData> m_queries;
+		unsigned int m_id;
+		Swift::Timer::ref m_collectTimer;
+};
+
+}