diff --git a/src/message.c b/src/message.c
index 3c9e4a0119..07566da949 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1920,8 +1920,9 @@ msg_prt_line(char_u *s, int list)
 		    && (mb_ptr2char(s) == 160
 			|| mb_ptr2char(s) == 0x202f))
 	    {
-		mb_char2bytes(curwin->w_lcs_chars.nbsp, buf);
-		buf[(*mb_ptr2len)(buf)] = NUL;
+		int len = mb_char2bytes(curwin->w_lcs_chars.nbsp, buf);
+
+		buf[len] = NUL;
 	    }
 	    else
 	    {
diff --git a/src/version.c b/src/version.c
index 3ee54db42b..4d63c86563 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5097,
 /**/
     5096,
 /**/