diff --git a/platform/platform-impl/src/com/intellij/ui/ErrorStripeEditorCustomization.java b/platform/platform-impl/src/com/intellij/ui/ErrorStripeEditorCustomization.java
new file mode 100644
index 000000000000..678abe0488df
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ui/ErrorStripeEditorCustomization.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ui;
+
+import com.intellij.openapi.editor.ex.EditorEx;
+import com.intellij.openapi.editor.ex.EditorMarkupModel;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+
+public class ErrorStripeEditorCustomization extends SimpleEditorCustomization {
+
+  public static final ErrorStripeEditorCustomization ENABLED = new ErrorStripeEditorCustomization(true);
+  public static final ErrorStripeEditorCustomization DISABLED = new ErrorStripeEditorCustomization(false);
+
+  private ErrorStripeEditorCustomization(boolean enabled) {
+    super(enabled);
+  }
+
+  @Override
+  public void customize(@NotNull EditorEx editor) {
+    if (isEnabled()) {
+      ((EditorMarkupModel)editor.getMarkupModel()).setErrorStripeVisible(true);
+      editor.getScrollPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+    }
+    else {
+      ((EditorMarkupModel)editor.getMarkupModel()).setErrorStripeVisible(false);
+    }
+  }
+}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
index 032f8f9e48be..d2cbf38c393a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
@@ -135,6 +135,7 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
     features.add(SoftWrapsEditorCustomization.ENABLED);
     features.add(AdditionalPageAtBottomEditorCustomization.DISABLED);
     features.add(MonospaceEditorCustomization.getInstance());
+    features.add(ErrorStripeEditorCustomization.ENABLED);
 
     EditorTextFieldProvider service = ServiceManager.getService(project, EditorTextFieldProvider.class);
     return service.getEditorField(FileTypes.PLAIN_TEXT.getLanguage(), project, features);