2 files changed, 6 insertions, 1 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp
index 6a12f8e..591e73c 100644
--- a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp
@@ -30,12 +30,16 @@ std::string MAMQuerySerializer::serializePayload(boost::shared_ptr<MAMQuery> pay
 	XMLElement element("query", "urn:xmpp:mam:0");
 
 	if (payload->getQueryID()) {
 		element.setAttribute("queryid", *payload->getQueryID());
 	}
 
+	if (payload->getNode()) {
+		element.setAttribute("node", *payload->getNode());
+	}
+
 	if (payload->getForm()) {
 		element.addNode(boost::make_shared<XMLRawTextNode>(FormSerializer().serialize(payload->getForm())));
 	}
 
 	if (payload->getResultSet()) {
 		element.addNode(boost::make_shared<XMLRawTextNode>(ResultSetSerializer().serialize(payload->getResultSet())));
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp
index 7f6cbd9..1d695cd 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp
@@ -41,17 +41,18 @@ class MAMQuerySerializerTest : public CppUnit::TestFixture {
 
 			boost::shared_ptr<ResultSet> set = boost::make_shared<ResultSet>();
 			set->setMaxItems(10);
 
 			boost::shared_ptr<MAMQuery> query(boost::make_shared<MAMQuery>());
 			query->setQueryID(std::string("id0"));
+			query->setNode(std::string("node1"));
 			query->setForm(parameters);
 			query->setResultSet(set);
 
 			std::string expectedResult =
-				"<query queryid=\"id0\" xmlns=\"urn:xmpp:mam:0\">"
+				"<query node=\"node1\" queryid=\"id0\" xmlns=\"urn:xmpp:mam:0\">"
 					"<x type=\"form\" xmlns=\"jabber:x:data\">"
 						"<field type=\"text-single\" var=\"FORM_TYPE\">"
 							"<value>urn:xmpp:mam:0</value>"
 						"</field>"
 						"<field type=\"text-single\" var=\"start\">"
 							"<value>2010-08-07T00:00:00Z</value>"