diff --git a/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java b/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java
index f5b255a6a40f..d4d072a0c0c0 100644
--- a/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java
+++ b/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java
@@ -25,7 +25,7 @@ import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.openapi.options.BeanConfigurable;
 
 public class JavaCodeFoldingOptionsProvider extends BeanConfigurable<JavaCodeFoldingSettings> implements CodeFoldingOptionsProvider {
-  protected JavaCodeFoldingOptionsProvider() {
+  public JavaCodeFoldingOptionsProvider() {
     super(JavaCodeFoldingSettings.getInstance());
     checkBox("COLLAPSE_ACCESSORS", ApplicationBundle.message("checkbox.collapse.simple.property.accessors"));
     checkBox("COLLAPSE_INNER_CLASSES", ApplicationBundle.message("checkbox.collapse.inner.classes"));
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/BaseCodeFoldingOptionsProvider.java b/platform/lang-impl/src/com/intellij/application/options/editor/BaseCodeFoldingOptionsProvider.java
index fd512411578c..3aa7d7ca7991 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/BaseCodeFoldingOptionsProvider.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/BaseCodeFoldingOptionsProvider.java
@@ -24,7 +24,7 @@ import com.intellij.codeInsight.folding.CodeFoldingSettings;
  * @author yole
  */
 public class BaseCodeFoldingOptionsProvider extends BeanConfigurable<CodeFoldingSettings> implements CodeFoldingOptionsProvider {
-  protected BaseCodeFoldingOptionsProvider() {
+  public BaseCodeFoldingOptionsProvider() {
     super(CodeFoldingSettings.getInstance());
     checkBox("COLLAPSE_FILE_HEADER", ApplicationBundle.message("checkbox.collapse.file.header"));
     checkBox("COLLAPSE_IMPORTS", ApplicationBundle.message("checkbox.collapse.title.imports"));
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
index ccc4a2f18fb5..301c863480bc 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
-import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.options.AbstractConfigurableEP;
 import com.intellij.openapi.options.CompositeConfigurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
@@ -33,7 +33,6 @@ import org.jetbrains.annotations.Nls;
 import javax.swing.*;
 import java.awt.*;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -102,7 +101,7 @@ public class CodeFoldingConfigurable extends CompositeConfigurable<CodeFoldingOp
   }
 
   protected List<CodeFoldingOptionsProvider> createConfigurables() {
-    return Arrays.asList(Extensions.getExtensions(CodeFoldingOptionsProvider.EP_NAME));
+    return AbstractConfigurableEP.createConfigurables(CodeFoldingOptionsProviderEP.EP_NAME);
   }
 
   public String getId() {
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java
index dd187b028dda..9de4c8981688 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java
@@ -24,5 +24,4 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.UnnamedConfigurable;
 
 public interface CodeFoldingOptionsProvider extends UnnamedConfigurable {
-  ExtensionPointName<CodeFoldingOptionsProvider> EP_NAME = ExtensionPointName.create("com.intellij.codeFoldingOptionsProvider");
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProviderEP.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProviderEP.java
new file mode 100644
index 000000000000..331c9813cbed
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProviderEP.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2010 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.application.options.editor;
+
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.options.AbstractConfigurableEP;
+
+/**
+ * @author nik
+ */
+public class CodeFoldingOptionsProviderEP extends AbstractConfigurableEP<CodeFoldingOptionsProvider> {
+  public static final ExtensionPointName<CodeFoldingOptionsProviderEP> EP_NAME = ExtensionPointName.create("com.intellij.codeFoldingOptionsProvider");
+}
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 628002656be9..e451c5c316da 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -1,6 +1,6 @@
 <extensionPoints>
   <extensionPoint name="errorOptionsProvider" interface="com.intellij.profile.codeInspection.ui.ErrorOptionsProvider"/>
-  <extensionPoint name="codeFoldingOptionsProvider" interface="com.intellij.application.options.editor.CodeFoldingOptionsProvider"/>
+  <extensionPoint name="codeFoldingOptionsProvider" beanClass="com.intellij.application.options.editor.CodeFoldingOptionsProviderEP"/>
   <extensionPoint name="autoImportOptionsProvider" beanClass="com.intellij.application.options.editor.AutoImportOptionsProviderEP"/>
   <extensionPoint name="moduleService" beanClass="com.intellij.openapi.components.ServiceDescriptor"/>
 
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index e015c00e9152..1eb7c4f8567e 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -431,7 +431,7 @@
   <codeInsight.linkHandler prefix="#inspection/" handlerClass="com.intellij.codeInsight.hint.InspectionDescriptionLinkHandler"/>
   <codeInsight.linkHandler prefix="#navigation/" handlerClass="com.intellij.codeInsight.hint.NavigationLinkHandler"/>
 
-  <codeFoldingOptionsProvider implementation="com.intellij.application.options.editor.BaseCodeFoldingOptionsProvider" order="first"/>
+  <codeFoldingOptionsProvider instance="com.intellij.application.options.editor.BaseCodeFoldingOptionsProvider" order="first"/>
   <editorOptionsProvider implementation="com.intellij.application.options.editor.EditorSmartKeysConfigurable"/>
   <editorOptionsProvider implementation="com.intellij.application.options.editor.EditorAppearanceConfigurable"/>
   <editorCustomization implementation="com.intellij.ui.SoftWrapsEditorCustomization"/>
diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index ecf4adfd1cfa..6cadf8e516e3 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -276,7 +276,7 @@
 
     <inspectionToolProvider implementation="com.intellij.codeInspection.htmlInspections.XmlInspectionToolProvider"/>
 
-    <codeFoldingOptionsProvider implementation="com.intellij.application.options.editor.XmlCodeFoldingOptionsProvider"/>
+    <codeFoldingOptionsProvider instance="com.intellij.application.options.editor.XmlCodeFoldingOptionsProvider"/>
 
     <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.XMLColorsPage"/>
     <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.HTMLColorsPage"/>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 78419ebbc049..c31a9c323284 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -188,7 +188,7 @@
                         serviceImplementation="com.intellij.openapi.module.impl.JavaAwareModuleTypeManagerImpl"/>
     <errorOptionsProvider implementation="com.intellij.profile.codeInspection.ui.JavaErrorOptionsProvider"/>
     <autoImportOptionsProvider instance="com.intellij.application.options.editor.JavaAutoImportOptions"/>
-    <codeFoldingOptionsProvider implementation="com.intellij.application.options.editor.JavaCodeFoldingOptionsProvider"/>
+    <codeFoldingOptionsProvider instance="com.intellij.application.options.editor.JavaCodeFoldingOptionsProvider"/>