diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/CommitMessageI.java b/platform/vcs-api/src/com/intellij/openapi/vcs/CommitMessageI.java
index 009c71489f05..3901a90b4e23 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/CommitMessageI.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/CommitMessageI.java
@@ -22,18 +22,6 @@ package com.intellij.openapi.vcs;
  * Time: 11:25 AM
  */
 public interface CommitMessageI {
-  /**
-   * @return    <code>true</code> if commit message is checked for spelling errors; <code>false</code> otherwise
-   */
-  boolean isCheckSpelling();
-
-  /**
-   * Allows to define whether commit message should be checked for spelling errors.
-   *
-   * @param checkSpelling  <code>true</code> if commit message should be checked for spelling errors; <code>false</code> otherwise
-   */
-  void setCheckSpelling(boolean checkSpelling);
-
   /**
    * Sets the description for the check-in.
    *
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index e4b1fe1c5ef1..37108a0f616c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -816,17 +816,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     return name != null ? name : VcsBundle.getString("commit.dialog.default.commit.operation.name");
   }
 
-  @Override
-  public boolean isCheckSpelling() {
-    return myVcsConfiguration.CHECK_COMMIT_MESSAGE_SPELLING;
-  }
-
-  @Override
-  public void setCheckSpelling(boolean checkSpelling) {
-    myVcsConfiguration.CHECK_COMMIT_MESSAGE_SPELLING = checkSpelling;
-    myCommitMessageArea.setCheckSpelling(checkSpelling);
-  }
-
   private boolean checkComment() {
     if (myVcsConfiguration.FORCE_NON_EMPTY_COMMENT && getCommitMessage().isEmpty()) {
       int requestForCheckin = Messages.showYesNoDialog(VcsBundle.message("confirmation.text.check.in.with.empty.comment"),
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 51cbce0fe32d..712a668e2894 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
@@ -19,9 +19,7 @@ import com.intellij.ide.DataManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.SpellCheckingEditorCustomizationProvider;
-import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
@@ -31,7 +29,6 @@ import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.ui.*;
-import com.intellij.util.Consumer;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -45,9 +42,7 @@ import java.util.Set;
 public class CommitMessage extends JPanel implements Disposable, DataProvider, CommitMessageI {
   public static final Key<DataContext> DATA_CONTEXT_KEY = Key.create("commit message data context");
   private final EditorTextField myEditorField;
-  private Consumer<String> myMessageConsumer;
   private TitledSeparator mySeparator;
-  private boolean myCheckSpelling;
 
   public CommitMessage(Project project) {
     this(project, true);
@@ -155,9 +150,6 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
   public void setText(final String initialMessage) {
     final String text = initialMessage == null ? "" : StringUtil.convertLineSeparators(initialMessage);
     myEditorField.setText(text);
-    if (myMessageConsumer != null) {
-      myMessageConsumer.consume(text);
-    }
   }
 
   @NotNull
@@ -169,30 +161,9 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
   public void requestFocusInMessage() {
     myEditorField.requestFocus();
     myEditorField.selectAll();
-
   }
+
   @Override
-  public boolean isCheckSpelling() {
-    return myCheckSpelling;
-  }
-
-  public void setCheckSpelling(boolean check) {
-    myCheckSpelling = check;
-    Editor editor = myEditorField.getEditor();
-    if (!(editor instanceof EditorEx)) {
-      return;
-    }
-    EditorEx editorEx = (EditorEx)editor;
-    EditorCustomization customization = SpellCheckingEditorCustomizationProvider.getInstance().getCustomization(check);
-    if (customization != null) {
-      customization.customize(editorEx);
-    }
-  }
-
   public void dispose() {
   }
-
-  public void setMessageConsumer(Consumer<String> messageConsumer) {
-    myMessageConsumer = messageConsumer;
-  }
 }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageDialog.java
index d45b2e6e8af7..c6de499a7945 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageDialog.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnEditCommitMessageDialog.java
@@ -65,7 +65,6 @@ public class SvnEditCommitMessageDialog extends DialogWrapper {
     wrapper.add(labelPanel, BorderLayout.WEST);
     parentPanel.add(wrapper, BorderLayout.NORTH);
     myCommitMessage = new CommitMessage(myProject, false);
-    myCommitMessage.setCheckSpelling(true);
     myCommitMessage.setText(myOldText);
     parentPanel.add(myCommitMessage, BorderLayout.CENTER);
     return parentPanel;