diff --git a/src/misc1.c b/src/misc1.c
index 74c8eaa..b27c527 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -985,6 +985,8 @@
 	if (msg_row > 0)
 	    cmdline_row = msg_row - 1;
 	need_wait_return = FALSE;
+	msg_didany = FALSE;
+	msg_didout = FALSE;
     }
     else
 	cmdline_row = save_cmdline_row;
diff --git a/src/version.c b/src/version.c
index 3a8e7ab..464de12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2258,
+/**/
     2257,
 /**/
     2256,