diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 0e255bf47..2904ecd32 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -533,7 +533,10 @@ gui_chat_display_word (struct t_gui_window *window,
                 }
             }
             if (window->win_chat_cursor_y < window->coords_size)
+            {
+                window->coords[window->win_chat_cursor_y].line = line;
                 window->coords[window->win_chat_cursor_y].data = (char *)word + (ptr_data - data);
+            }
         }
 
         chars_to_display = gui_chat_strlen_screen (ptr_data);
@@ -1389,7 +1392,6 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
     {
         if (window->win_chat_cursor_y < window->coords_size)
             window->coords[window->win_chat_cursor_y].data = line->data->message;
-        window->coords_x_message = window->win_chat_cursor_x;
     }
 
     /* reset color & style for a new line */
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index 5506634e5..e18f74b13 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -139,7 +139,7 @@ gui_window_get_context_at_xy (struct t_gui_window *window,
                               char **beginning,
                               char **end)
 {
-    int win_x, win_y;
+    int win_x, win_y, coords_x_message;
     char *data_next_line, *str_temp;
     const char *ptr_data, *word_start, *word_end, *last_space;
 
@@ -183,7 +183,11 @@ gui_window_get_context_at_xy (struct t_gui_window *window,
     if (!window->coords[win_y].data)
         return;
 
-    if (win_x < window->coords_x_message)
+    coords_x_message = gui_line_get_align ((*line)->data->buffer, *line, 0,
+                                           ((win_y > 0) &&
+                                            (window->coords[win_y - 1].line != *line)));
+
+    if (win_x < coords_x_message)
     {
         /* X is before message (time/buffer/prefix) */
         if ((win_x >= window->coords[win_y].time_x1)
@@ -209,7 +213,7 @@ gui_window_get_context_at_xy (struct t_gui_window *window,
                           && (window->coords[win_y + 1].line == *line)) ?
             window->coords[win_y + 1].data : NULL;
         ptr_data = gui_chat_string_add_offset_screen (window->coords[win_y].data,
-                                                      win_x - window->coords_x_message);
+                                                      win_x - coords_x_message);
         if (ptr_data && ptr_data[0]
             && (!data_next_line || (ptr_data < data_next_line)))
         {
@@ -670,7 +674,6 @@ gui_window_new (struct t_gui_window *parent_window, struct t_gui_buffer *buffer,
     /* coordinates */
     new_window->coords_size = 0;
     new_window->coords = NULL;
-    new_window->coords_x_message = 0;
 
     /* tree */
     new_window->ptr_tree = ptr_leaf;
@@ -970,7 +973,6 @@ gui_window_coords_alloc (struct t_gui_window *window)
             gui_window_coords_init_line (window, i);
         }
     }
-    window->coords_x_message = 0;
 }
 
 /*
@@ -2028,7 +2030,6 @@ gui_window_print_log ()
         log_printf ("  scroll. . . . . . . : 0x%lx", ptr_window->scroll);
         log_printf ("  coords_size . . . . : %d",    ptr_window->coords_size);
         log_printf ("  coords. . . . . . . : 0x%lx", ptr_window->coords);
-        log_printf ("  coords_x_message. . : %d",    ptr_window->coords_x_message);
         log_printf ("  ptr_tree. . . . . . : 0x%lx", ptr_window->ptr_tree);
         log_printf ("  prev_window . . . . : 0x%lx", ptr_window->prev_window);
         log_printf ("  next_window . . . . : 0x%lx", ptr_window->next_window);
diff --git a/src/gui/gui-window.h b/src/gui/gui-window.h
index c9962e449..2216071d4 100644
--- a/src/gui/gui-window.h
+++ b/src/gui/gui-window.h
@@ -76,7 +76,6 @@ struct t_gui_window
     /* coordinates (for focus) */
     int coords_size;                   /* size of coords (number of lines)  */
     struct t_gui_window_coords *coords;/* coords for window                 */
-    int coords_x_message;              /* start X for messages              */
 
     /* tree */
     struct t_gui_window_tree *ptr_tree;/* pointer to leaf in windows tree   */