diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 1a232faa8d1e96a4d45ff426a76ab9f5b4b32d88..830d065e8e78fadf24175d51f38e984622fdf9b3 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -649,6 +649,10 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool
 		msg->setBody(payload.message());
 	}
 
+	if (payload.headline()) {
+		msg->setType(Swift::Message::Headline);
+	}
+
 	// Add xhtml-im payload.
 	if (CONFIG_BOOL(m_config, "service.enable_xhtml") && !payload.xhtml().empty()) {
 		msg->addPayload(boost::make_shared<Swift::XHTMLIMPayload>(payload.xhtml()));