diff --git a/include/transport/Frontend.h b/include/transport/Frontend.h
index fa3d0b7a3509e43435a01044a6df4e8c0f22f7d9..0de40c127fda01ff4aa7c6cdaa975a67a57e0b6b 100644
--- a/include/transport/Frontend.h
+++ b/include/transport/Frontend.h
@@ -96,6 +96,8 @@ class Frontend {
 		virtual std::string getRegistrationFields() { return "Jabber ID\n3rd-party network username\n3rd-party network password"; }
 		virtual bool handleAdminMessage(Swift::Message::ref /*message*/) { return false; }
 
+		virtual bool isRawXMLEnabled() { return false; }
+
 		boost::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
 		boost::signal<void (User *, boost::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
 		boost::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyUpdated;
diff --git a/include/transport/Transport.h b/include/transport/Transport.h
index c72094e868353a3fd6d48ecf871387f0b118bec2..4a190a8d4dc3814a03be27df8f419e619d887770 100644
--- a/include/transport/Transport.h
+++ b/include/transport/Transport.h
@@ -101,10 +101,6 @@ namespace Transport {
 
 			Config *getConfig() { return m_config; }
 
-			bool isRawXMLEnabled() {
-				return m_rawXML;
-			}
-
 			/// It's emitted only for presences addressed to transport itself
 			/// (for example to="j2j.domain.tld") and for presences comming to
 			/// MUC (for example to="#chat%irc.freenode.org@irc.domain.tld")
@@ -142,7 +138,6 @@ namespace Transport {
 			Swift::JID m_jid;
 			Factory *m_factory;
 			Swift::EventLoop *m_loop;
-			bool m_rawXML;
 			Frontend *m_frontend;
 
 		friend class User;
diff --git a/libtransport/LocalBuddy.cpp b/libtransport/LocalBuddy.cpp
index 7fa2a4719ffbabbf49ea7bc222a9098c638b7a25..8a0e0aef523b4c4faffd930be0c3053c1964168d 100644
--- a/libtransport/LocalBuddy.cpp
+++ b/libtransport/LocalBuddy.cpp
@@ -22,6 +22,7 @@
 #include "transport/User.h"
 #include "transport/RosterManager.h"
 #include "transport/Transport.h"
+#include "transport/Frontend.h"
 
 namespace Transport {
 
@@ -101,7 +102,7 @@ void LocalBuddy::setGroups(const std::vector<std::string> &groups) {
 }
 
 bool LocalBuddy::getStatus(Swift::StatusShow &status, std::string &statusMessage) {
-	if (getRosterManager()->getUser()->getComponent()->isRawXMLEnabled()) {
+	if (getRosterManager()->getUser()->getComponent()->getFrontend()->isRawXMLEnabled()) {
 		return false;
 	}
 	status = m_status;
diff --git a/libtransport/Transport.cpp b/libtransport/Transport.cpp
index 5e8e70f50fea1ecc8b5ff02434d9dc3742bc23ed..084aaeba40b19de1004c4aa484cf5e0aa4cd9243 100644
--- a/libtransport/Transport.cpp
+++ b/libtransport/Transport.cpp
@@ -43,7 +43,6 @@ Component::Component(Frontend *frontend, Swift::EventLoop *loop, Swift::NetworkF
 	m_factory = factory;
 	m_loop = loop;
 	m_userRegistry = userRegistry;
-	m_rawXML = false;
 	m_jid = Swift::JID(CONFIG_STRING(m_config, "service.jid"));
 
 	m_factories = factories;
diff --git a/tests/libtransport/networkpluginserver.cpp b/tests/libtransport/networkpluginserver.cpp
index a6c34ddc26239b5b4652fb578c73291f6cf06c62..d9cd4f0f5c4ea896be114a78db56c49949646eb3 100644
--- a/tests/libtransport/networkpluginserver.cpp
+++ b/tests/libtransport/networkpluginserver.cpp
@@ -42,8 +42,8 @@ class NetworkPluginServerTest : public CPPUNIT_NS :: TestFixture, public BasicTe
 	CPPUNIT_TEST(handleBuddyChangedPayloadUserContactInRoster);
 	CPPUNIT_TEST(handleMessageHeadline);
 	CPPUNIT_TEST(handleConvMessageAckPayload);
-// 	CPPUNIT_TEST(handleRawXML);
-// 	CPPUNIT_TEST(handleRawXMLSplit);
+	CPPUNIT_TEST(handleRawXML);
+	CPPUNIT_TEST(handleRawXMLSplit);
 
 	CPPUNIT_TEST(benchmarkHandleBuddyChangedPayload);
 	CPPUNIT_TEST(benchmarkSendUnavailablePresence);