diff --git a/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java b/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java
index 6823d69e3337..ab1c1e1c218b 100644
--- a/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java
+++ b/xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java
@@ -16,6 +16,7 @@
 package com.intellij.codeInsight.completion;
 
 import com.intellij.lang.Language;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.filters.AndFilter;
 import com.intellij.psi.filters.ElementFilter;
@@ -39,7 +40,6 @@ import org.jetbrains.annotations.NonNls;
 public class HtmlCompletionData extends XmlCompletionData {
   private boolean myCaseInsensitive;
   private static final @NonNls String JAVASCRIPT_LANGUAGE_ID = "JavaScript";
-  private static final @NonNls String STYLE_TAG = "style";
 
   public HtmlCompletionData() {
     this(true);
@@ -98,7 +98,7 @@ public class HtmlCompletionData extends XmlCompletionData {
           return true;
         }
 
-        if (equalNames(name, STYLE_TAG) ||
+        if (equalNames(name, HtmlUtil.STYLE_TAG_NAME) ||
             equalNames(name, HtmlUtil.SCRIPT_TAG_NAME)) {
           return false;
         }
@@ -155,14 +155,7 @@ public class HtmlCompletionData extends XmlCompletionData {
 
   private boolean isStyleAttributeContext(PsiElement position) {
     XmlAttribute parentOfType = PsiTreeUtil.getParentOfType(position, XmlAttribute.class, false);
-
-    if (parentOfType != null) {
-      String name = parentOfType.getName();
-      if (myCaseInsensitive) return STYLE_TAG.equalsIgnoreCase(name);
-      return STYLE_TAG.equals(name); //name.endsWith("style");
-    }
-
-    return false;
+    return parentOfType != null && Comparing.strEqual(parentOfType.getName(), HtmlUtil.STYLE_TAG_NAME, !myCaseInsensitive);
   }
 
   @Override
diff --git a/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java b/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java
index db2fd348a71e..724c2b061122 100644
--- a/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java
+++ b/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java
@@ -20,7 +20,6 @@ import com.intellij.lang.folding.FoldingBuilder;
 import com.intellij.lang.folding.FoldingDescriptor;
 import com.intellij.lang.folding.LanguageFolding;
 import com.intellij.lang.xml.XMLLanguage;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.DumbAware;
@@ -33,6 +32,7 @@ import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.psi.xml.*;
 import com.intellij.util.containers.ContainerUtil;
+import com.intellij.xml.util.HtmlUtil;
 import com.intellij.xml.util.XmlTagUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -41,10 +41,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class XmlCodeFoldingBuilder implements FoldingBuilder, DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.xml.XmlFoldingBuilder");
   private static final TokenSet XML_ATTRIBUTE_SET = TokenSet.create(XmlElementType.XML_ATTRIBUTE);
   private static final int MIN_TEXT_RANGE_LENGTH = 3;
-  private static final String STYLE_ATTRIBUTE = "style";
 
   @Override
   @NotNull
@@ -239,7 +237,7 @@ public abstract class XmlCodeFoldingBuilder implements FoldingBuilder, DumbAware
 
   private static boolean isAttributeShouldBeFolded(XmlAttribute child) {
     return child.getContainingFile() instanceof HtmlFileImpl &&
-           STYLE_ATTRIBUTE.equalsIgnoreCase(child.getName());
+           HtmlUtil.STYLE_ATTRIBUTE_NAME.equalsIgnoreCase(child.getName());
   }
 
   protected abstract XmlCodeFoldingSettings getFoldingSettings();
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java
index 13386ee24022..3c3221b92b9e 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java
@@ -76,6 +76,7 @@ public class HtmlUtil {
   public static final String SCRIPT_TAG_NAME = "script";
   public static final String STYLE_TAG_NAME = "style";
 
+  public static final String STYLE_ATTRIBUTE_NAME = STYLE_TAG_NAME;
   public static final String ID_ATTRIBUTE_NAME = "id";
   public static final String CLASS_ATTRIBUTE_NAME = "class";