diff --git a/src/message.c b/src/message.c
index cb749da..41dfffb 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1390,8 +1390,10 @@
 									attr);
 		plain_start = str + 1;
 		msg_puts_attr(s, attr == 0 ? hl_attr(HLF_8) : attr);
+		retval += STRLEN(s);
 	    }
-	    retval += char2cells(*str);
+	    else
+		++retval;
 	    ++str;
 	}
     }
diff --git a/src/version.c b/src/version.c
index 28ac16a..a9773dd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    15,
+/**/
     14,
 /**/
     13,