diff --git a/src/event/client_events.c b/src/event/client_events.c
index 10354a5f..d3f63455 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -395,7 +395,6 @@ cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char *const msg, const char *
 
         message_send_private(privwin->fulljid, plugin_msg, oob_url);
         chat_log_msg_out(jidp->barejid, plugin_msg, jidp->resourcepart);
-        // TODO replace_id
         privwin_outgoing_msg(privwin, NULL, NULL, plugin_msg);
 
         plugins_post_priv_message_send(privwin->fulljid, plugin_msg);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 6cafd13a..c1c2b6cf 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -197,7 +197,6 @@ void mucwin_set_message_char(ProfMucWin *mucwin, const char *const ch);
 void mucwin_unset_message_char(ProfMucWin *mucwin);
 
 // MUC private chat window
-// TODO repalce_id?
 void privwin_incoming_msg(ProfPrivateWin *privatewin, ProfMessage *message);
 void privwin_outgoing_msg(ProfPrivateWin *privwin, const char *const id, const char *const replace_id, const char *const message);
 void privwin_message_occupant_offline(ProfPrivateWin *privwin);
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index aa519755..1254120d 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -972,14 +972,6 @@ _private_chat_handler(xmpp_stanza_t *const stanza)
         message->id = strdup(id);
     }
 
-    xmpp_stanza_t *replace_id_stanza = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_LAST_MESSAGE_CORRECTION);
-    if (replace_id_stanza) {
-        const char *replace_id = xmpp_stanza_get_id(replace_id_stanza);
-        if (replace_id) {
-            message->replace_id = strdup(replace_id);
-        }
-    }
-
     // check omemo encryption
 #ifdef HAVE_OMEMO
     message->plain = omemo_receive_message(stanza, &message->trusted);