diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index 3ac626afb..cfbee356f 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -387,12 +387,10 @@ gui_chat_get_line_align (struct t_gui_buffer *buffer, struct t_gui_line *line,
             && CONFIG_STRING(config_look_prefix_suffix)[0])
             length_suffix = gui_chat_strlen_screen (CONFIG_STRING(config_look_prefix_suffix)) + 1;
     }
-    if (CONFIG_INTEGER(config_look_prefix_align_max) > 0)
-        return gui_chat_time_length + 1 + CONFIG_INTEGER(config_look_prefix_align_max) +
-            length_suffix + 1;
-    else
-        return gui_chat_time_length + ((buffer->prefix_max_length > 0) ? 1 : 0) +
-            + buffer->prefix_max_length + length_suffix + 1;
+    return gui_chat_time_length + ((buffer->prefix_max_length > 0) ? 1 : 0) +
+        + ((buffer->prefix_max_length > CONFIG_INTEGER(config_look_prefix_align_max)) ?
+           CONFIG_INTEGER(config_look_prefix_align_max) : buffer->prefix_max_length)
+        + length_suffix + 1;
 }
 
 /*