2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c
index b21a4328e..07eddf7cd 100644
--- a/src/plugins/irc/irc-ctcp.c
+++ b/src/plugins/irc/irc-ctcp.c
@@ -155,7 +155,7 @@ irc_ctcp_display_reply_from_nick (struct t_irc_server *server, time_t date,
 
     while (arguments && arguments[0])
     {
-        pos_end = strchr (arguments + 1, '\01');
+        pos_end = strrchr (arguments + 1, '\01');
         if (pos_end)
             pos_end[0] = '\0';
 
diff --git a/src/plugins/irc/irc-input.c b/src/plugins/irc/irc-input.c
index ddd13cc00..881819caf 100644
--- a/src/plugins/irc/irc-input.c
+++ b/src/plugins/irc/irc-input.c
@@ -55,7 +55,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, int action,
     if (strncmp (text, "\01ACTION ", 8) == 0)
     {
         action = 1;
-        pos = strchr (text + 8, '\01');
+        pos = strrchr (text + 8, '\01');
         if (pos)
             text2 = weechat_strndup (text + 8, pos - text - 8);
         else