diff --git a/ChangeLog b/ChangeLog
index 2d03f0254..b6af4c8f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2004-01-01
+ChangeLog - 2004-01-02
 
 
+Version 0.0.5 (under dev!):
+   * highlight action messages
+
 Version 0.0.4 (2004-01-01):
    * Perl plugin, with auto-load
    * when private window is created (another user is talking), WeeChat does not
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 26aa1fc24..bc58cb2a0 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -787,8 +787,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                     if (pos2)
                         pos2[0] = '\0';
                     irc_display_prefix (ptr_channel->window, PREFIX_ACTION_ME);
-                    gui_printf_color (ptr_channel->window,
-                                      COLOR_WIN_CHAT_NICK, "%s", host);
+                    if (strstr (pos, server->nick))
+                        gui_printf_color (ptr_channel->window,
+                                          COLOR_WIN_CHAT_HIGHLIGHT, "%s", host);
+                    else
+                        gui_printf_color (ptr_channel->window,
+                                          COLOR_WIN_CHAT_NICK, "%s", host);
                     gui_printf_color (ptr_channel->window,
                                       COLOR_WIN_CHAT, " %s\n", pos);
                 }
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 2d03f0254..b6af4c8f9 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,9 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2004-01-01
+ChangeLog - 2004-01-02
 
 
+Version 0.0.5 (under dev!):
+   * highlight action messages
+
 Version 0.0.4 (2004-01-01):
    * Perl plugin, with auto-load
    * when private window is created (another user is talking), WeeChat does not
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index 26aa1fc24..bc58cb2a0 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -787,8 +787,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                     if (pos2)
                         pos2[0] = '\0';
                     irc_display_prefix (ptr_channel->window, PREFIX_ACTION_ME);
-                    gui_printf_color (ptr_channel->window,
-                                      COLOR_WIN_CHAT_NICK, "%s", host);
+                    if (strstr (pos, server->nick))
+                        gui_printf_color (ptr_channel->window,
+                                          COLOR_WIN_CHAT_HIGHLIGHT, "%s", host);
+                    else
+                        gui_printf_color (ptr_channel->window,
+                                          COLOR_WIN_CHAT_NICK, "%s", host);
                     gui_printf_color (ptr_channel->window,
                                       COLOR_WIN_CHAT, " %s\n", pos);
                 }