diff --git a/src/popupmenu.c b/src/popupmenu.c
index 5a2f070313..71bb499845 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -731,7 +731,7 @@ pum_redraw(void)
 				char_u		*old_rt = NULL;
 				char_u		*orig_rt = NULL;
 
-				cells = vim_strsize(rt);
+				cells = mb_string2cells(rt, -1);
 				need_ellipsis = p_pmw > ellipsis_width
 						    && pum_width == p_pmw
 						    && cells > pum_width;
diff --git a/src/version.c b/src/version.c
index 2a83869a49..7d6c7e3f9b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1257,
 /**/
     1256,
 /**/