diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 4e9d42d..990055b 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -234,6 +234,8 @@ void Bridge::send_channel_message(const Iid& iid, const std::string& body, std::
 #else
       uuid = utils::gen_uuid();
 #endif
+      if (id.empty())
+        id = utils::gen_uuid();
 
       IrcChannel* channel = irc->get_channel(iid.get_local());
       if (!channel->joined)
@@ -264,12 +266,12 @@ void Bridge::send_channel_message(const Iid& iid, const std::string& body, std::
             }
         }
 
-      MessageCallback mirror_to_all_resources = [this, iid, uuid, nodes_to_reflect, body](const IrcClient* irc, const IrcMessage&) {
+      MessageCallback mirror_to_all_resources = [this, iid, uuid, id, nodes_to_reflect, body](const IrcClient* irc, const IrcMessage&) {
         for (const auto& resource: this->resources_in_chan[iid.to_tuple()])
           {
             auto stanza = this->xmpp.make_muc_message(std::to_string(iid), irc->get_own_nick(), this->make_xmpp_body(body),
                                                        this->user_jid + "/"
-                                                       + resource, uuid, uuid);
+                                                       + resource, uuid, id);
             for (const auto& node: nodes_to_reflect)
                 stanza.add_child(node);
             this->xmpp.send_stanza(stanza);
diff --git a/tests/end_to_end/scenarios/channel_messages.py b/tests/end_to_end/scenarios/channel_messages.py
index 3262832..b55914e 100644
--- a/tests/end_to_end/scenarios/channel_messages.py
+++ b/tests/end_to_end/scenarios/channel_messages.py
@@ -29,7 +29,7 @@ scenario = (
             "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
         ],
         [
-            "/message[@id][@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='coucou']",
+            "/message[@id][@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='\ncoucou']",
             "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
         ]
     ),
diff --git a/tests/end_to_end/scenarios/multiline_message.py b/tests/end_to_end/scenarios/multiline_message.py
index c29c1e7..c35c44b 100644
--- a/tests/end_to_end/scenarios/multiline_message.py
+++ b/tests/end_to_end/scenarios/multiline_message.py
@@ -8,9 +8,7 @@ scenario = (
     # Send a multi-line channel message
     send_stanza("<message id='the-message-id' from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>un\ndeux\ntrois</body></message>"),
     # Receive multiple messages, in order
-    expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='un']"),
-    expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='deux']"),
-    expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='trois']"),
+    expect_stanza("/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='un\ndeux\ntrois']"),
 
     # Send a simple message, with no id
     send_stanza("<message from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>hello</body></message>"),
@@ -51,12 +49,8 @@ scenario = (
     send_stanza("<message id='the-message-id' from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'><body>a\nb\nc</body></message>"),
     # Receive multiple messages, for each user
     expect_unordered(
-        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='a']"],
-        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='b']"],
-        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='c']"],
+        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id='the-message-id'][@to='{jid_one}/{resource_one}'][@type='groupchat']/body[text()='a\nb\nc']"],
 
-        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='a']"],
-        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='b']"],
-        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='c']"],
+        ["/message[@from='#foo%{irc_server_one}/{nick_one}'][@id][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='\na\nb\nc']"],
     )
 )
diff --git a/tests/end_to_end/scenarios/slash_me_channel_message.py b/tests/end_to_end/scenarios/slash_me_channel_message.py
index d30fba3..28d1289 100644
--- a/tests/end_to_end/scenarios/slash_me_channel_message.py
+++ b/tests/end_to_end/scenarios/slash_me_channel_message.py
@@ -11,7 +11,7 @@ scenario = (
             "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
         ],
         [
-            "/message[@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='/me rit en IRC']",
+            "/message[@from='#foo%{irc_server_one}/{nick_one}'][@to='{jid_two}/{resource_one}'][@type='groupchat']/body[text()='\n/me rit en IRC']",
             "/message/stable_id:stanza-id[@by='#foo%{irc_server_one}'][@id]"
         ],
     ),