diff -ur ratpoison/AUTHORS ratpoison-map_window-bug-fixed/AUTHORS
--- ratpoison/AUTHORS	2005-04-10 21:27:58.000000000 +0200
+++ ratpoison-map_window-bug-fixed/AUTHORS	2005-04-16 17:56:03.088388890 +0200
@@ -20,7 +20,7 @@
 Gergely Nagy <address@hidden>
 Henrik Enberg <address@hidden>
 Jonathan Walther <address@hidden>
-Martin Samuelsson <address@hidden>
+Martin Samuelsson <address@hidden>
 Mike Meyer <address@hidden>
 Nicklas Lindgren <address@hidden>
 Pasi Kallinen <address@hidden>
diff -ur ratpoison/src/manage.c ratpoison-map_window-bug-fixed/src/manage.c
--- ratpoison/src/manage.c	2004-12-06 08:26:47.000000000 +0100
+++ ratpoison-map_window-bug-fixed/src/manage.c	2005-04-16 17:33:45.040612002 +0200
@@ -785,6 +785,8 @@
 void
 map_window (rp_window *win)
 {
+  rp_window_elem *elem;
+
   PRINT_DEBUG (("Mapping the unmapped window %s\n", window_name (win)));
 
   /* Fill in the necessary data about the window */
@@ -799,6 +801,9 @@
   /* Update all groups. */
   groups_map_window (win);
 
+  /* Find out were the window really went */
+  elem = group_find_window (&rp_current_group->mapped_windows, win);
+
   /* The window has never been accessed since it was brought back from
      the Withdrawn state. */
   win->last_access = 0;
@@ -814,10 +819,10 @@
     {
       if (win->transient)
 	marked_message_printf (0, 0, MESSAGE_MAP_TRANSIENT, 
-			       win->number, window_name (win));
+			       elem->number, window_name (win));
       else
 	marked_message_printf (0, 0, MESSAGE_MAP_WINDOW,
-			       win->number, window_name (win));
+			       elem->number, window_name (win));
     }
 }