diff --git a/src/message.c b/src/message.c
index 9c57491..609922a 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1842,7 +1842,7 @@
     int		wrap;
 
     did_wait_return = FALSE;
-    while (*s != NUL && (maxlen < 0 || (int)(s - str) < maxlen))
+    while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
     {
 	/*
 	 * We are at the end of the screen line when:
diff --git a/src/version.c b/src/version.c
index 96b11d0..7663fc6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    53,
+/**/
     52,
 /**/
     51,