diff --git a/src/eval.c b/src/eval.c
index e895b997b..d66fe57f4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -14397,7 +14397,8 @@ f_setline(argvars, rettv)
 	    if (u_savesub(lnum) == OK && ml_replace(lnum, line, TRUE) == OK)
 	    {
 		changed_bytes(lnum, 0);
-		check_cursor_col();
+		if (lnum == curwin->w_cursor.lnum)
+		    check_cursor_col();
 		rettv->vval.v_number = 0;	/* OK */
 	    }
 	}
diff --git a/src/misc2.c b/src/misc2.c
index 14c4784cf..cdff6abad 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -516,7 +516,14 @@ check_cursor_col()
 		|| virtual_active())
 	    curwin->w_cursor.col = len;
 	else
+	{
 	    curwin->w_cursor.col = len - 1;
+#ifdef FEAT_MBYTE
+	    /* prevent cursor from moving on the trail byte */
+	    if (has_mbyte)
+		mb_adjust_cursor();
+#endif
+	}
     }
 
 #ifdef FEAT_VIRTUALEDIT
diff --git a/src/version.c b/src/version.c
index 3c8b1733e..47f2f33de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    225,
 /**/
     224,
 /**/