diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index 2204558249b9..2994d104ea4a 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -67,6 +67,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.LineTokenizer;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.pom.Navigatable;
@@ -564,7 +565,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
 
       myDeferredTypes.add(contentType);
 
-      s = StringUtil.convertLineSeparators(s, true);
+      s = StringUtil.convertLineSeparators(s, !SystemInfo.isMac);
       myContentSize += s.length();
       myDeferredOutputLength += s.length();
       StringBuilder bufferToUse;
@@ -1323,6 +1324,10 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       return;
     }
     ConsoleFolding current = foldingForLine(getLineText(document, line, false));
+    //TODO den remove
+    if (System.currentTimeMillis() > 1) {
+      current = null;
+    }
     if (current != null) {
       myFolding.put(line, current);
     }
diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index 271a0ecdd9f9..e2ae4e1890aa 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -300,7 +300,7 @@ public class StringUtil {
       }
       else if (c == '\r') {
         boolean followedByLineFeed = i < text.length() - 1 && text.charAt(i + 1) == '\n';
-        if (!followedByLineFeed && keepCarriageReturn && !SystemInfo.isMac) {
+        if (!followedByLineFeed && keepCarriageReturn) {
           if (buffer == null) {
             intactLength++;
           }