diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
index 07e9cd2ba37d..d6578da14678 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
@@ -154,6 +154,8 @@ public class CodeStyleSettings extends CommonCodeStyleSettings implements Clonea
 
   public boolean USE_SAME_INDENTS = false;
 
+  public boolean IGNORE_SAME_INDENTS_FOR_LANGUAGES = false;
+
   @Deprecated
   public final IndentOptions JAVA_INDENT_OPTIONS = new IndentOptions();
   @Deprecated
@@ -611,6 +613,8 @@ public class CodeStyleSettings extends CommonCodeStyleSettings implements Clonea
       copyOldIndentOptions("jsp", JSP_INDENT_OPTIONS);
       copyOldIndentOptions("xml", XML_INDENT_OPTIONS);
     }
+
+    if (USE_SAME_INDENTS) IGNORE_SAME_INDENTS_FOR_LANGUAGES = true;
   }
 
   private void copyOldIndentOptions(@NonNls final String extension, final IndentOptions options) {
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
index ae0ad3b46409..d5f3e7143669 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
@@ -73,7 +73,7 @@ public class CommonCodeStyleSettings {
           myIndentOptions.copyFrom(fileTypeIdentOptions);
           rootSettings.unregisterAdditionalIndentOptions(myFileType);
         }
-        else if (rootSettings.USE_SAME_INDENTS) {
+        else if (rootSettings.USE_SAME_INDENTS && !rootSettings.IGNORE_SAME_INDENTS_FOR_LANGUAGES) {
           myIndentOptions.copyFrom(rootSettings.OTHER_INDENT_OPTIONS);
         }
       }