diff --git a/win/curses/cursmesg.c b/win/curses/cursmesg.c
index 42f6825a3..ebcf9e6b1 100644
--- a/win/curses/cursmesg.c
+++ b/win/curses/cursmesg.c
@@ -986,20 +986,13 @@ curses_putmsghistory(const char *msg, boolean restoring_msghist)
     }
 
     /*
-     * FIXME:
-     *  restoring a game with window borders on and align_status:left
-     *  (which pushes the starting column of the message window to the
-     *  right) brings up an initial display where the border around
-     *  the message window is missing.  Once a new message causes it
-     *  to be scrolled, its border appears.  This absurd hack forces
-     *  that to be shown right away.
+     * Restoring a game with window borders on and align_status:left
+     * (which pushes the starting column of the message window to the
+     * right) brings up an initial display where the border around
+     * the message window is missing.  This draws it.
      */
-    if (restoring_msghist && curses_window_has_border(WIN_MESSAGE)) {
-        WINDOW *win = curses_get_nhwin(WIN_MESSAGE);
-
-        box(win, 0, 0);
-        wrefresh(win);
-    }
+    if (restoring_msghist)
+        curses_last_messages();
 }
 
 /*cursmesg.c*/