diff --git a/ChangeLog b/ChangeLog
index b7ed5bf41..7d0b9e54a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-08-17
+ChangeLog - 2006-08-18
 
 Version 0.2.0 (under dev!):
+   * IRC raw buffer now uses join/part prefix with color to display messages
    * added send of "quit" message to server when using /disconnect
    * fixed "wallops" command when received, now displayed by WeeChat (bug #17441)
    * fixed /wallops command (now many words are correctly sent)
diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c
index 37b71c0e4..8dcaa167a 100644
--- a/src/gui/gui-common.c
+++ b/src/gui/gui-common.c
@@ -380,8 +380,8 @@ gui_printf_raw_data (void *server, int send, char *message)
                               GUI_COLOR(COLOR_WIN_CHAT_SERVER),
                               ((t_irc_server *)server)->name,
                               GUI_COLOR(COLOR_WIN_CHAT_DARK),
-                              GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
-                              (send) ? "<<--" : "-->>",
+                              GUI_COLOR((send) ? COLOR_WIN_CHAT_PART : COLOR_WIN_CHAT_JOIN),
+                              (send) ? PREFIX_PART : PREFIX_JOIN,
                               GUI_COLOR(COLOR_WIN_CHAT),
                               message);
             if (pos)
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index b7ed5bf41..7d0b9e54a 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-08-17
+ChangeLog - 2006-08-18
 
 Version 0.2.0 (under dev!):
+   * IRC raw buffer now uses join/part prefix with color to display messages
    * added send of "quit" message to server when using /disconnect
    * fixed "wallops" command when received, now displayed by WeeChat (bug #17441)
    * fixed /wallops command (now many words are correctly sent)
diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c
index 37b71c0e4..8dcaa167a 100644
--- a/weechat/src/gui/gui-common.c
+++ b/weechat/src/gui/gui-common.c
@@ -380,8 +380,8 @@ gui_printf_raw_data (void *server, int send, char *message)
                               GUI_COLOR(COLOR_WIN_CHAT_SERVER),
                               ((t_irc_server *)server)->name,
                               GUI_COLOR(COLOR_WIN_CHAT_DARK),
-                              GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
-                              (send) ? "<<--" : "-->>",
+                              GUI_COLOR((send) ? COLOR_WIN_CHAT_PART : COLOR_WIN_CHAT_JOIN),
+                              (send) ? PREFIX_PART : PREFIX_JOIN,
                               GUI_COLOR(COLOR_WIN_CHAT),
                               message);
             if (pos)