diff --git a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java
index 4fb5cc3fcb2a..e7ce3d36f774 100644
--- a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java
+++ b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.core;
 
+import com.intellij.codeInsight.folding.CodeFoldingSettings;
 import com.intellij.concurrency.*;
 import com.intellij.lang.*;
 import com.intellij.lang.impl.PsiBuilderFactoryImpl;
@@ -125,6 +126,7 @@ public class CoreApplicationEnvironment {
     ProgressIndicatorProvider.ourInstance = createProgressIndicatorProvider();
 
     myApplication.registerService(JobLauncher.class, createJobLauncher());
+    myApplication.registerService(CodeFoldingSettings.class, new CodeFoldingSettings());
   }
 
   public <T> void registerApplicationService(@NotNull Class<T> serviceInterface, @NotNull T serviceImplementation) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/CodeFoldingSettingsImpl.java b/platform/editor-ui-ex/src/com/intellij/codeInsight/folding/CodeFoldingSettingsImpl.java
similarity index 97%
rename from platform/lang-impl/src/com/intellij/codeInsight/folding/CodeFoldingSettingsImpl.java
rename to platform/editor-ui-ex/src/com/intellij/codeInsight/folding/CodeFoldingSettingsImpl.java
index 92f449cbb34f..144a604572d7 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/CodeFoldingSettingsImpl.java
+++ b/platform/editor-ui-ex/src/com/intellij/codeInsight/folding/CodeFoldingSettingsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2014 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.