diff --git a/test/functionality4/xmpp-inbox.sh b/test/functionality4/xmpp-inbox.sh
index d0c45aa..a8c8fc5 100755
--- a/test/functionality4/xmpp-inbox.sh
+++ b/test/functionality4/xmpp-inbox.sh
@@ -183,7 +183,7 @@ expected_inbox_1=$(cat << EOF
     <body>from user 3 to user 1</body>
     <request xmlns="urn:xmpp:receipts"/>
   </message></forwarded><read>false</read><box>inbox</box><archive>false</archive><mute>0</mute></result></message>
-<iq id='$query_id_1' type='result'><fin/></iq>
+<iq id="$query_id_1" type="result"><fin/></iq>
 EOF
 )
 
@@ -196,7 +196,7 @@ expected_inbox_2=$(cat << EOF
     <body>from user 3 to user 2</body>
     <request xmlns="urn:xmpp:receipts"/>
   </message></forwarded><read>false</read><box>chats</box><archive>false</archive><mute>0</mute></result></message>
-<iq id='$query_id_2' type='result'><fin/></iq>
+<iq id="$query_id_2" type="result"><fin/></iq>
 EOF
 )
 
@@ -209,7 +209,7 @@ expected_inbox_3=$(cat << EOF
     <body>from user 3 to user 2</body>
     <request xmlns="urn:xmpp:receipts"/>
   </message></forwarded><read>true</read><box>chats</box><archive>false</archive><mute>0</mute></result></message>
-<iq id='$query_id_3' type='result'><fin/></iq>
+<iq id="$query_id_3" type="result"><fin/></iq>
 EOF
 )
 
@@ -233,7 +233,7 @@ expected_inbox_1=$(cat << EOF
     <body>from user 3 to user 1</body>
     <request xmlns="urn:xmpp:receipts"/>
   </message></forwarded><read>false</read><box>inbox</box><archive>false</archive><mute>0</mute></result></message>
-<iq id='$query_id_1' type='result'><fin/></iq>
+<iq id="$query_id_1" type="result"><fin/></iq>
 EOF
 )
 
diff --git a/test/functionality4/xmpp-mam.sh b/test/functionality4/xmpp-mam.sh
index 5e15b76..fd2627d 100755
--- a/test/functionality4/xmpp-mam.sh
+++ b/test/functionality4/xmpp-mam.sh
@@ -245,56 +245,56 @@ actual_conversation_3_4=$(get_conversation "$user3uuid" "$user3token" "$user4uui
 
 
 expected_conversation_2_1=$(cat << EOF
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_1 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user2uuid}@duolicious.app/testresource'></delay><message from='${user2uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>3rd message from user 2 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_1 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user2uuid}@duolicious.app/testresource'></delay><message from='${user2uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>4th message from user 2 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_1 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user2uuid}@duolicious.app/testresource'></delay><message from='${user2uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>5th message from user 2 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='$(( $query_id_1 + 1 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2'><set xmlns='http://jabber.org/protocol/rsm'><first index='2'>redacted</first><last>redacted</last><count>5</count></set></fin></iq>
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_1 + 2 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user2uuid}@duolicious.app/testresource'></delay><message from='${user2uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>1st message from user 2 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_1 + 2 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user2uuid}@duolicious.app/testresource'></delay><message from='${user2uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>2nd message from user 2 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='$(( $query_id_1 + 2 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><first index='0'>redacted</first><last>redacted</last><count>5</count></set></fin></iq>
-<iq from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='$(( $query_id_1 + 3 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><count>5</count></set></fin></iq>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_1 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user2uuid}@duolicious.app/testresource"></delay><message from="${user2uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>3rd message from user 2 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_1 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user2uuid}@duolicious.app/testresource"></delay><message from="${user2uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>4th message from user 2 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_1 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user2uuid}@duolicious.app/testresource"></delay><message from="${user2uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>5th message from user 2 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="$(( $query_id_1 + 1 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2"><set xmlns="http://jabber.org/protocol/rsm"><first index="2">redacted</first><last>redacted</last><count>5</count></set></fin></iq>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_1 + 2 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user2uuid}@duolicious.app/testresource"></delay><message from="${user2uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>1st message from user 2 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_1 + 2 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user2uuid}@duolicious.app/testresource"></delay><message from="${user2uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>2nd message from user 2 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="$(( $query_id_1 + 2 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><first index="0">redacted</first><last>redacted</last><count>5</count></set></fin></iq>
+<iq from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="$(( $query_id_1 + 3 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><count>5</count></set></fin></iq>
 EOF
 )
 
 expected_conversation_2_3=$(cat << EOF
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_2 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user2uuid}@duolicious.app' id='redacted'><body>1st from user 3 to user 2</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_2 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user2uuid}@duolicious.app' id='redacted'><body>2st from user 3 to user 2</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_2 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user2uuid}@duolicious.app' id='redacted'><body>3st from user 3 to user 2</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='$(( $query_id_2 + 1 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2'><set xmlns='http://jabber.org/protocol/rsm'><first index='1'>redacted</first><last>redacted</last><count>4</count></set></fin></iq>
-<message from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_2 + 2 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user2uuid}@duolicious.app/testresource'></delay><message from='${user2uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user3uuid}@duolicious.app' id='redacted'><body>1st message from user 2 to user 3</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='$(( $query_id_2 + 2 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><first index='0'>redacted</first><last>redacted</last><count>4</count></set></fin></iq>
-<iq from='${user2uuid}@duolicious.app' to='${user2uuid}@duolicious.app/testresource' id='$(( $query_id_2 + 3 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><count>4</count></set></fin></iq>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_2 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user2uuid}@duolicious.app" id="redacted"><body>1st from user 3 to user 2</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_2 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user2uuid}@duolicious.app" id="redacted"><body>2st from user 3 to user 2</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_2 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user2uuid}@duolicious.app" id="redacted"><body>3st from user 3 to user 2</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="$(( $query_id_2 + 1 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2"><set xmlns="http://jabber.org/protocol/rsm"><first index="1">redacted</first><last>redacted</last><count>4</count></set></fin></iq>
+<message from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_2 + 2 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user2uuid}@duolicious.app/testresource"></delay><message from="${user2uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user3uuid}@duolicious.app" id="redacted"><body>1st message from user 2 to user 3</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="$(( $query_id_2 + 2 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><first index="0">redacted</first><last>redacted</last><count>4</count></set></fin></iq>
+<iq from="${user2uuid}@duolicious.app" to="${user2uuid}@duolicious.app/testresource" id="$(( $query_id_2 + 3 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><count>4</count></set></fin></iq>
 EOF
 )
 
 expected_conversation_3_1=$(cat << EOF
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_3 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>5st from user 3 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_3 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>6st from user 3 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_3 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>7st from user 3 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_3 + 1 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2'><set xmlns='http://jabber.org/protocol/rsm'><first index='4'>redacted</first><last>redacted</last><count>7</count></set></fin></iq>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_3 + 2 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>2st from user 3 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_3 + 2 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>3st from user 3 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_3 + 2 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>4st from user 3 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_3 + 2 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2'><set xmlns='http://jabber.org/protocol/rsm'><first index='1'>redacted</first><last>redacted</last><count>7</count></set></fin></iq>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_3 + 3 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user1uuid}@duolicious.app' id='redacted'><body>1st from user 3 to user 1</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_3 + 3 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><first index='0'>redacted</first><last>redacted</last><count>7</count></set></fin></iq>
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_3 + 4 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><count>7</count></set></fin></iq>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_3 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>5st from user 3 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_3 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>6st from user 3 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_3 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>7st from user 3 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_3 + 1 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2"><set xmlns="http://jabber.org/protocol/rsm"><first index="4">redacted</first><last>redacted</last><count>7</count></set></fin></iq>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_3 + 2 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>2st from user 3 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_3 + 2 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>3st from user 3 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_3 + 2 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>4st from user 3 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_3 + 2 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2"><set xmlns="http://jabber.org/protocol/rsm"><first index="1">redacted</first><last>redacted</last><count>7</count></set></fin></iq>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_3 + 3 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user1uuid}@duolicious.app" id="redacted"><body>1st from user 3 to user 1</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_3 + 3 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><first index="0">redacted</first><last>redacted</last><count>7</count></set></fin></iq>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_3 + 4 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><count>7</count></set></fin></iq>
 EOF
 )
 
 expected_conversation_3_2=$(cat << EOF
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_4 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user2uuid}@duolicious.app' id='redacted'><body>1st from user 3 to user 2</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_4 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user2uuid}@duolicious.app' id='redacted'><body>2st from user 3 to user 2</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_4 + 1 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user3uuid}@duolicious.app/testresource'></delay><message from='${user3uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user2uuid}@duolicious.app' id='redacted'><body>3st from user 3 to user 2</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_4 + 1 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2'><set xmlns='http://jabber.org/protocol/rsm'><first index='1'>redacted</first><last>redacted</last><count>4</count></set></fin></iq>
-<message from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='redacted' xmlns='jabber:client'><result queryid='$(( $query_id_4 + 2 ))' xmlns='urn:xmpp:mam:2' id='redacted'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='redacted' from='${user2uuid}@duolicious.app/testresource'></delay><message from='${user2uuid}@duolicious.app/testresource' xmlns='jabber:client' type='chat' to='${user3uuid}@duolicious.app' id='redacted'><body>1st message from user 2 to user 3</body><request xmlns='urn:xmpp:receipts'/></message></forwarded></result></message>
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_4 + 2 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><first index='0'>redacted</first><last>redacted</last><count>4</count></set></fin></iq>
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_4 + 3 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><count>4</count></set></fin></iq>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_4 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user2uuid}@duolicious.app" id="redacted"><body>1st from user 3 to user 2</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_4 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user2uuid}@duolicious.app" id="redacted"><body>2st from user 3 to user 2</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_4 + 1 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user3uuid}@duolicious.app/testresource"></delay><message from="${user3uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user2uuid}@duolicious.app" id="redacted"><body>3st from user 3 to user 2</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_4 + 1 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2"><set xmlns="http://jabber.org/protocol/rsm"><first index="1">redacted</first><last>redacted</last><count>4</count></set></fin></iq>
+<message from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="redacted" xmlns="jabber:client"><result queryid="$(( $query_id_4 + 2 ))" xmlns="urn:xmpp:mam:2" id="redacted"><forwarded xmlns="urn:xmpp:forward:0"><delay xmlns="urn:xmpp:delay" stamp="redacted" from="${user2uuid}@duolicious.app/testresource"></delay><message from="${user2uuid}@duolicious.app/testresource" xmlns="jabber:client" type="chat" to="${user3uuid}@duolicious.app" id="redacted"><body>1st message from user 2 to user 3</body><request xmlns="urn:xmpp:receipts"/></message></forwarded></result></message>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_4 + 2 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><first index="0">redacted</first><last>redacted</last><count>4</count></set></fin></iq>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_4 + 3 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><count>4</count></set></fin></iq>
 EOF
 )
 
 expected_conversation_3_4=$(cat << EOF
-<iq from='${user3uuid}@duolicious.app' to='${user3uuid}@duolicious.app/testresource' id='$(( $query_id_5 + 1 ))' type='result' xmlns='jabber:client'><fin xmlns='urn:xmpp:mam:2' complete='true'><set xmlns='http://jabber.org/protocol/rsm'><count>0</count></set></fin></iq>
+<iq from="${user3uuid}@duolicious.app" to="${user3uuid}@duolicious.app/testresource" id="$(( $query_id_5 + 1 ))" type="result" xmlns="jabber:client"><fin xmlns="urn:xmpp:mam:2" complete="true"><set xmlns="http://jabber.org/protocol/rsm"><count>0</count></set></fin></iq>
 EOF
 )
 
