diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
index 3ac734541758..7c0f29840789 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -99,10 +99,12 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
 
   private Editor myFullEditor;
   private ActionGroup myFullEditorActions;
+  private final boolean myDoSaveErrorsToHistory;
 
-  public LanguageConsoleImpl(final Project project, String title, final Language language) {
+  public LanguageConsoleImpl(final Project project, String title, final Language language, final boolean doSaveErrorsToHistory) {
     myProject = project;
     myTitle = title;
+    myDoSaveErrorsToHistory = doSaveErrorsToHistory;
     installEditorFactoryListener();
     final EditorFactory editorFactory = EditorFactory.getInstance();
     myHistoryFile = new LightVirtualFile(getTitle() + ".history.txt", StdFileTypes.PLAIN_TEXT, "");
@@ -365,8 +367,10 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
       }
       iterator.advance();
     }
-    duplicateHighlighters(markupModel, consoleEditor.getDocument().getMarkupModel(myProject), offset, textRange);
-    duplicateHighlighters(markupModel, consoleEditor.getMarkupModel(), offset, textRange);
+    if (myDoSaveErrorsToHistory) {
+      duplicateHighlighters(markupModel, consoleEditor.getDocument().getMarkupModel(myProject), offset, textRange);
+      duplicateHighlighters(markupModel, consoleEditor.getMarkupModel(), offset, textRange);
+    }
     if (!text.endsWith("\n")) history.insertString(history.getTextLength(), "\n");
     return text;
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleViewImpl.java
index 0463388349f8..d97b884573da 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleViewImpl.java
@@ -17,12 +17,9 @@ package com.intellij.execution.console;
 
 import com.intellij.execution.impl.ConsoleViewImpl;
 import com.intellij.lang.Language;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiFile;
 
 import javax.swing.*;
 
@@ -33,7 +30,7 @@ public class LanguageConsoleViewImpl extends ConsoleViewImpl {
   protected LanguageConsoleImpl myConsole;
 
   public LanguageConsoleViewImpl(final Project project, String title, final Language language) {
-    this(project, new LanguageConsoleImpl(project, title, language));
+    this(project, new LanguageConsoleImpl(project, title, language, true));
   }
 
   protected LanguageConsoleViewImpl(final Project project, final LanguageConsoleImpl console) {