diff --git a/platform/platform-api/src/com/intellij/openapi/editor/GenericLineWrapPositionStrategy.java b/platform/platform-api/src/com/intellij/openapi/editor/GenericLineWrapPositionStrategy.java
index 925339a59991..7d276ac8e875 100644
--- a/platform/platform-api/src/com/intellij/openapi/editor/GenericLineWrapPositionStrategy.java
+++ b/platform/platform-api/src/com/intellij/openapi/editor/GenericLineWrapPositionStrategy.java
@@ -127,7 +127,7 @@ public class GenericLineWrapPositionStrategy implements LineWrapPositionStrategy
       }
     }
 
-    return maxPreferredOffsetToUse;
+    return endOffset;
   }
 
   /**
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
index 7535a1d53f4f..6e78715acb38 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
@@ -419,7 +419,7 @@ public class SoftWrapApplianceManager implements FoldingListener, DocumentListen
       myLineWrapPositionStrategy = LanguageLineWrapPositionStrategy.INSTANCE.forEditor(myEditor);
     }
     int softWrapOffset = myLineWrapPositionStrategy.calculateWrapPosition(
-      document.getCharsSequence(), minOffset, maxOffset, preferredOffset, minOffset != preferredOffset
+      document.getCharsSequence(), minOffset, maxOffset, preferredOffset, true
     );
     if (softWrapOffset >= lineData.endLineOffset) {
       return null;
@@ -625,7 +625,7 @@ public class SoftWrapApplianceManager implements FoldingListener, DocumentListen
       int endLine = document.getLineNumber(endRange.getEndOffset());
       int endOffset = document.getLineEndOffset(endLine);
       int textLength = document.getTextLength();
-      if (textLength > 0 && endOffset >= textLength) {
+      if (textLength > 0 && endOffset > textLength) {
         endOffset = textLength - 1;
       }
       endRange = new TextRange(document.getLineStartOffset(startLine), endOffset);