diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2bdf0c7f7a..8c74dd8322 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2695,7 +2695,7 @@ doend:
     {
 	/* messages could be enabled for a serious error, need to check if the
 	 * counters don't become negative */
-	if (!did_emsg)
+	if (!did_emsg || msg_silent > save_msg_silent)
 	    msg_silent = save_msg_silent;
 	emsg_silent -= did_esilent;
 	if (emsg_silent < 0)
diff --git a/src/version.c b/src/version.c
index 3633057d3c..3102a6fec1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    265,
 /**/
     264,
 /**/