diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 1cd0092233e6cb87cef2fa371e82207ee2f2f781..4e016af3d911b43f253c0cc98d80bde6b1335a95 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -35,7 +35,6 @@
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Network/BoostConnectionServer.h"
 #include "Swiften/Elements/AttentionPayload.h"
-#include "Swiften/Elements/XHTMLIMPayload.h"
 #include "pbnetwork.pb.h"
 #include "sys/wait.h"
 #include "sys/signal.h"
@@ -392,10 +391,6 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool
 		msg->setBody(payload.message());
 	}
 
-	if (!payload.xhtml().empty()) {
-		msg->addPayload(boost::make_shared<Swift::XHTMLIMPayload>(payload.xhtml()));
-	}
-
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.buddyname());
 	if (!conv) {
 		conv = new NetworkConversation(user->getConversationManager(), payload.buddyname());
@@ -650,7 +645,7 @@ void NetworkPluginServer::handleUserDestroyed(User *user) {
 }
 
 void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &msg) {
-	// handle ChatState
+
 	boost::shared_ptr<Swift::ChatState> statePayload = msg->getPayload<Swift::ChatState>();
 	if (statePayload) {
 		pbnetwork::WrapperMessage_Type type = pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED;
@@ -682,7 +677,6 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost
 		}
 	}
 
-	// Handle attention requests
 	boost::shared_ptr<Swift::AttentionPayload> attentionPayload = msg->getPayload<Swift::AttentionPayload>();
 	if (attentionPayload) {
 		pbnetwork::ConversationMessage m;
@@ -699,20 +693,13 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost
 		send(c->connection, message);
 		return;
 	}
+	
 
-	std::string xhtml;
-	boost::shared_ptr<Swift::XHTMLIMPayload> xhtmlPayload = msg->getPayload<Swift::XHTMLIMPayload>();
-	if (xhtmlPayload) {
-		xhtml = xhtmlPayload->getBody();
-	}
-
-	// Send normal message
-	if (!msg->getBody().empty() || !xhtml.empty()) {
+	if (!msg->getBody().empty()) {
 		pbnetwork::ConversationMessage m;
 		m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());
 		m.set_buddyname(conv->getLegacyName());
 		m.set_message(msg->getBody());
-		m.set_xhtml(xhtml);
 
 		std::string message;
 		m.SerializeToString(&message);