diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 98aff02..bb0f6dd 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -634,15 +634,20 @@
   call s:compare_lines(expect, lines)
   " Scroll down one screen line
   setl scrolloff=5
-  norm! 6gj
-  redraw!
+  norm! 5gj
   let lines = s:screen_lines(1, 20)
   let expect = [
-	\ "> aaaaaaaaaaaaaaaaaa",
+	\ "aaaaaaaaaaaaaaaaaaaa",
 	\ "> aaaaaaaaaaaaaaaaaa",
 	\ "> aaaaaaaaaaaaaaaaaa",
 	\ ]
   call s:compare_lines(expect, lines)
+  redraw!
+  " moving the cursor doesn't change the text offset
+  norm! l
+  redraw!
+  let lines = s:screen_lines(1, 20)
+  call s:compare_lines(expect, lines)
 
   setl breakindent briopt=min:18 sbr=>
   norm! 5gj
diff --git a/src/version.c b/src/version.c
index 708fb95..3c9edfd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2496,
+/**/
     2495,
 /**/
     2494,