diff --git a/src/message.c b/src/message.c
index 4040e5ba56..7a6e346096 100644
--- a/src/message.c
+++ b/src/message.c
@@ -307,7 +307,8 @@ trunc_string(
     }
     else
     {
-	for (i = (int)STRLEN(s); len + (n = ptr2cells(s + i - 1)) <= room; --i)
+	for (i = (int)STRLEN(s);
+		   i - 1 >= 0 && len + (n = ptr2cells(s + i - 1)) <= room; --i)
 	    len += n;
     }
 
diff --git a/src/message_test.c b/src/message_test.c
index 6faad65fec..23650dd6bc 100644
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -100,8 +100,14 @@ main(int argc, char **argv)
     params.argc = argc;
     params.argv = argv;
     common_init(&params);
-    init_chartab();
 
+    set_option_value((char_u *)"encoding", 0, (char_u *)"utf-8", 0);
+    init_chartab();
     test_trunc_string();
+
+    set_option_value((char_u *)"encoding", 0, (char_u *)"latin1", 0);
+    init_chartab();
+    test_trunc_string();
+
     return 0;
 }
diff --git a/src/version.c b/src/version.c
index aeb1920b9f..3a22ca41d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    60,
 /**/
     59,
 /**/