diff --git a/src/message.c b/src/message.c
index 591691f..bb3517c 100644
--- a/src/message.c
+++ b/src/message.c
@@ -3055,7 +3055,8 @@
     {
 	char_u *tofree = NULL;
 
-	if (maxlen > 0 && STRLEN(p) > (size_t)maxlen)
+	if (maxlen > 0 && vim_strlen_maxlen((char *)p, (size_t)maxlen)
+							     >= (size_t)maxlen)
 	{
 	    tofree = vim_strnsave(p, (size_t)maxlen);
 	    p = tofree;