diff --git a/src/ChangeLog b/src/ChangeLog
index 52914d4bd..c5e8436d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-24  Pavel Roskin  <proski@gnu.org>
+
+	* view.c (display): Fix wrapping of tabs.
+	Reported by Arpad Biro <biro_arpad@yahoo.com>
+
 2002-09-23  Pavel Roskin  <proski@gnu.org>
 
 	* dlg.h: New message DLG_RESIZE.
diff --git a/src/view.c b/src/view.c
index 070ec9bc0..292bc22e5 100644
--- a/src/view.c
+++ b/src/view.c
@@ -969,7 +969,7 @@ display (WView * view)
 	    get_byte (view, from);
 	for (; row < height && from < view->last_byte; from++) {
 	    c = get_byte (view, from);
-	    if ((c == '\n') || (col == width && view->wrap_mode)) {
+	    if ((c == '\n') || (col >= width && view->wrap_mode)) {
 		col = frame_shift;
 		row++;
 		if (c == '\n' || row >= height)