diff --git a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
index e8e7324433cb..1b7b0e11d21e 100644
--- a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
+++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
@@ -2,10 +2,10 @@ package com.intellij.openapi.diff.impl.settings;
 
 import com.intellij.application.options.colors.ColorAndFontSettingsListener;
 import com.intellij.application.options.colors.PreviewPanel;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diff.DiffBundle;
 import com.intellij.openapi.diff.DiffContent;
 import com.intellij.openapi.diff.DiffRequest;
-import com.intellij.openapi.diff.SimpleContent;
 import com.intellij.openapi.diff.impl.incrementalMerge.Change;
 import com.intellij.openapi.diff.impl.incrementalMerge.MergeList;
 import com.intellij.openapi.diff.impl.incrementalMerge.MergeSearchHelper;
@@ -15,11 +15,8 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.event.*;
 import com.intellij.openapi.editor.ex.util.EditorUtil;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.Disposable;
 import com.intellij.util.EventDispatcher;
-import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
 import java.awt.*;
@@ -109,11 +106,7 @@ public class DiffPreviewPanel implements PreviewPanel {
     }
 
     public DiffContent[] getContents() {
-      return new DiffContent[]{createContent(LEFT_TEXT), createContent(CENTER_TEXT), createContent(RIGHT_TEXT)};
-    }
-
-    private static SimpleContent createContent(String text) {
-      return new SimpleContent(text, StdFileTypes.JAVA);
+      return DiffPreviewProvider.getContents();
     }
 
     public String[] getContentTitles() { return new String[]{"", "", ""}; }
@@ -124,33 +117,6 @@ public class DiffPreviewPanel implements PreviewPanel {
     myDispatcher.addListener(listener);
   }
 
-  @NonNls private static final String LEFT_TEXT = "class MyClass {\n" +
-                                                                            "  int value;\n" +
-                                                                            "\n" +
-                                                                            "  void leftOnly() {}\n" +
-                                                                            "\n" +
-                                                                            "  void foo() {\n" +
-                                                                            "   // Left changes\n" +
-                                                                            "  }\n" +
-                                                                            "}";
-  @NonNls private static final String CENTER_TEXT = "class MyClass {\n" +
-                                            "  int value;\n" +
-                                            "\n" +
-                                            "  void foo() {\n" +
-                                            "  }\n" +
-                                            "\n" +
-                                            "  void removedFromLeft() {}\n" +
-                                            "}";
-  @NonNls private static final String RIGHT_TEXT = "class MyClass {\n" +
-                                           "  long value;\n" +
-                                           "\n" +
-                                           "  void foo() {\n" +
-                                           "   // Left changes\n" +
-                                           "  }\n" +
-                                           "\n" +
-                                           "  void removedFromLeft() {}\n" +
-                                           "}";
-
   private class EditorClickListener extends EditorMouseAdapter implements CaretListener {
     private final int myIndex;
 
diff --git a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java
new file mode 100644
index 000000000000..580b370e48a2
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java
@@ -0,0 +1,57 @@
+package com.intellij.openapi.diff.impl.settings;
+
+import com.intellij.openapi.diff.DiffContent;
+import com.intellij.openapi.diff.SimpleContent;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import org.jetbrains.annotations.NonNls;
+
+/**
+ * @author oleg
+ * Implement this interface to enable custom diff preview in Colors & Fonts Settings page
+ */
+public abstract class DiffPreviewProvider {
+  public static final ExtensionPointName<DiffPreviewProvider> EP_NAME = ExtensionPointName.create("com.intellij.diffPreviewProvider");
+
+  public abstract DiffContent[] createContents();
+
+  public static DiffContent[] getContents() {
+    // Assuming that standalone IDE should provide one provider
+    for (DiffPreviewProvider diffPreviewProvider : Extensions.getExtensions(EP_NAME)) {
+      return diffPreviewProvider.createContents();
+    }
+    return new DiffContent[]{createContent(LEFT_TEXT), createContent(CENTER_TEXT), createContent(RIGHT_TEXT)};
+  }
+
+  private static SimpleContent createContent(String text) {
+    return new SimpleContent(text, StdFileTypes.JAVA);
+  }
+
+  @NonNls private static final String LEFT_TEXT = "class MyClass {\n" +
+                                                  "  int value;\n" +
+                                                  "\n" +
+                                                  "  void leftOnly() {}\n" +
+                                                  "\n" +
+                                                  "  void foo() {\n" +
+                                                  "   // Left changes\n" +
+                                                  "  }\n" +
+                                                  "}";
+  @NonNls private static final String CENTER_TEXT = "class MyClass {\n" +
+                                                    "  int value;\n" +
+                                                    "\n" +
+                                                    "  void foo() {\n" +
+                                                    "  }\n" +
+                                                    "\n" +
+                                                    "  void removedFromLeft() {}\n" +
+                                                    "}";
+  @NonNls private static final String RIGHT_TEXT = "class MyClass {\n" +
+                                                   "  long value;\n" +
+                                                   "\n" +
+                                                   "  void foo() {\n" +
+                                                   "   // Left changes\n" +
+                                                   "  }\n" +
+                                                   "\n" +
+                                                   "  void removedFromLeft() {}\n" +
+                                                   "}";
+}
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 53e0ed20ef37..944a7ce14a7a 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -401,4 +401,6 @@
   <extensionPoint name="testActionProvider" interface="com.intellij.execution.testframework.ToggleModelActionProvider"/>
 
   <extensionPoint name="psiViewerExtension" interface="com.intellij.internal.psiView.PsiViewerExtension"/>
+
+  <extensionPoint name="diffPreviewProvider" interface="com.intellij.openapi.diff.impl.settings.DiffPreviewProvider"/>
 </extensionPoints>