diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties
index 9e64e62cff5b..9b2e1b480bb7 100644
--- a/platform/platform-resources-en/src/messages/XmlBundle.properties
+++ b/platform/platform-resources-en/src/messages/XmlBundle.properties
@@ -136,6 +136,7 @@ fix.html.family=Fix Html
 
 xml.options=XML Options
 xml.editor.options.breadcrumbs.title=Show HTML breadcrumbs (Reopen editor for changes to take effect)
+xml.editor.options.breadcrumbs.for.xml.title=Show breadcrumbs for XML files
 xml.editor.options.misc.title=XML/HTML
 
 invalid.url.title=Invalid URL
diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java
index ed95a1a62593..4f68031c75f2 100644
--- a/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java
+++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorAppearanceConfigurable.java
@@ -26,6 +26,7 @@ public class WebEditorAppearanceConfigurable extends BeanConfigurable<WebEditorO
   public WebEditorAppearanceConfigurable() {
     super(WebEditorOptions.getInstance());
     checkBox("breadcrumbsEnabled", XmlBundle.message("xml.editor.options.breadcrumbs.title"));
+    checkBox("breadcrumbsEnabledInXml", XmlBundle.message("xml.editor.options.breadcrumbs.for.xml.title"));
     checkBox("showCssColorPreviewInGutter", "Show CSS Color preview icon in gutter");
   }
 }
diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java
index f08d76516076..aa7ac3df5d0c 100644
--- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java
+++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java
@@ -39,6 +39,7 @@ import java.io.File;
 public class WebEditorOptions implements PersistentStateComponent<WebEditorOptions>, ExportableComponent {
 
   private boolean myBreadcrumbsEnabled = true;
+  private boolean myBreadcrumbsEnabledInXml = false;
   private boolean myShowCssColorPreviewInGutter = true;
   private boolean myAutomaticallyInsertClosingTag = true;
   private boolean myAutomaticallyInsertRequiredAttributes = true;
@@ -59,6 +60,14 @@ public class WebEditorOptions implements PersistentStateComponent<WebEditorOptio
     return myBreadcrumbsEnabled;
   }
 
+  public void setBreadcrumbsEnabledInXml(boolean b) {
+    myBreadcrumbsEnabledInXml = b;
+  }
+
+  public boolean isBreadcrumbsEnabledInXml() {
+    return myBreadcrumbsEnabledInXml;
+  }
+
   public boolean isShowCssColorPreviewInGutter() {
     return myShowCssColorPreviewInGutter;
   }
diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java
index 5fb89b19168b..236d5cd730c4 100644
--- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java
+++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java
@@ -44,7 +44,8 @@ public class BreadcrumbsLoaderComponent extends AbstractProjectComponent {
   }
 
   private static boolean isEnabled() {
-    return WebEditorOptions.getInstance().isBreadcrumbsEnabled();
+    final WebEditorOptions webEditorOptions = WebEditorOptions.getInstance();
+    return webEditorOptions.isBreadcrumbsEnabled() || webEditorOptions.isBreadcrumbsEnabledInXml();
   }
 
   private static class MyFileEditorManagerListener implements FileEditorManagerListener {
diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java
index d06d45ee3e39..1636c1aa0e4a 100644
--- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java
+++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java
@@ -15,7 +15,9 @@
  */
 package com.intellij.xml.breadcrumbs;
 
+import com.intellij.application.options.editor.WebEditorOptions;
 import com.intellij.lang.Language;
+import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -252,8 +254,11 @@ public class BreadcrumbsXmlWrapper implements BreadcrumbsItemListener<Breadcrumb
   static BreadcrumbsInfoProvider findInfoProvider(@Nullable FileViewProvider viewProvider) {
     BreadcrumbsInfoProvider provider = null;
     if (viewProvider != null) {
+      final WebEditorOptions webEditorOptions = WebEditorOptions.getInstance();
       final Language baseLang = viewProvider.getBaseLanguage();
       provider = getInfoProvider(baseLang);
+      if (!webEditorOptions.isBreadcrumbsEnabledInXml() && baseLang == XMLLanguage.INSTANCE) return null;
+      if (!webEditorOptions.isBreadcrumbsEnabled() && baseLang != XMLLanguage.INSTANCE) return null;
       if (provider == null) {
         for (final Language language : viewProvider.getLanguages()) {
           provider = getInfoProvider(language);
diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java b/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java
index 4849c981d0aa..9f736ee21345 100644
--- a/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java
+++ b/xml/impl/src/com/intellij/xml/breadcrumbs/XmlLanguageBreadcrumbsInfoProvider.java
@@ -44,7 +44,7 @@ public class XmlLanguageBreadcrumbsInfoProvider extends BreadcrumbsInfoProvider
   }
 
   public Language[] getLanguages() {
-    return new Language[]{XHTMLLanguage.INSTANCE, HTMLLanguage.INSTANCE};
+    return new Language[]{XMLLanguage.INSTANCE, XHTMLLanguage.INSTANCE, HTMLLanguage.INSTANCE};
   }
 
   @NotNull
@@ -77,7 +77,7 @@ public class XmlLanguageBreadcrumbsInfoProvider extends BreadcrumbsInfoProvider
   @Nullable
   public String getElementTooltip(@NotNull final PsiElement e) {
     final XmlTag tag = (XmlTag)e;
-    final StringBuffer result = new StringBuffer("<");
+    final StringBuffer result = new StringBuffer("&lt;");
     result.append(tag.getName());
     final XmlAttribute[] attributes = tag.getAttributes();
     for (final XmlAttribute each : attributes) {
@@ -85,10 +85,10 @@ public class XmlLanguageBreadcrumbsInfoProvider extends BreadcrumbsInfoProvider
     }
 
     if (tag.isEmpty()) {
-      result.append("/>");
+      result.append("/&gt;");
     }
     else {
-      result.append(">...</").append(tag.getName()).append(">");
+      result.append("&gt;...&lt;/").append(tag.getName()).append("&gt;");
     }
 
     return result.toString();