diff --git a/ChangeLog b/ChangeLog
index 241f393e7..0da37642f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-07-25
+ChangeLog - 2006-07-27
 
 Version 0.2.0 (under dev!):
+   * fixed nick alignment problem when look_nickmode is off
    * added generic function for incoming numeric IRC commands (bug #16611)
    * fixed crash when doing "/part something" on a server buffer (bug #17201)
    * charsets are now checked when set by /charset command
diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c
index 743cf8b87..3a9d49113 100644
--- a/src/irc/irc-display.c
+++ b/src/irc/irc-display.c
@@ -171,7 +171,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
         length += strlen (cfg_look_nick_prefix);
     if (external_nick)
         length += 2;
-    if (nick)
+    if (nick && cfg_look_nickmode)
     {
         if (nick->flags & (NICK_CHANOWNER | NICK_CHANADMIN |
                            NICK_OP | NICK_HALFOP | NICK_VOICE))
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 241f393e7..0da37642f 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-07-25
+ChangeLog - 2006-07-27
 
 Version 0.2.0 (under dev!):
+   * fixed nick alignment problem when look_nickmode is off
    * added generic function for incoming numeric IRC commands (bug #16611)
    * fixed crash when doing "/part something" on a server buffer (bug #17201)
    * charsets are now checked when set by /charset command
diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c
index 743cf8b87..3a9d49113 100644
--- a/weechat/src/irc/irc-display.c
+++ b/weechat/src/irc/irc-display.c
@@ -171,7 +171,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
         length += strlen (cfg_look_nick_prefix);
     if (external_nick)
         length += 2;
-    if (nick)
+    if (nick && cfg_look_nickmode)
     {
         if (nick->flags & (NICK_CHANOWNER | NICK_CHANADMIN |
                            NICK_OP | NICK_HALFOP | NICK_VOICE))