diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 219edea467c..5667b788145 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-14 Alain Magloire
+
+	Pr 73831. Tentative fix
+	* src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencPage.java
+	* src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java
+
 2004-09-14 Alain Magloire
 
 	Define contentTypes for some of the
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
index 0453252fb15..2c3fd2f441c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
@@ -470,8 +470,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP
 
 	private Control createPreviewer(Composite parent) {
 
-		fCTextTools = new CTextTools(fOverlayStore);
-
+		fCTextTools = CUIPlugin.getDefault().getTextTools();
 		fPreviewViewer = new SourceViewer(parent, null, SWT.V_SCROLL | SWT.H_SCROLL);
 		fPreviewViewer.configure(new CSourceViewerConfiguration(fCTextTools, null));
 		fPreviewViewer.getTextWidget().setFont(JFaceResources.getFontRegistry().get(JFaceResources.TEXT_FONT));
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java
index eef5f1f03b9..d8e6cd91484 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java
@@ -69,7 +69,7 @@ public class CColorManager implements IColorManager, IColorManagerExtension {
 	 * @see IColorManager#dispose
 	 */
 	public void dispose() {
-		// nothing to dispose
+		dispose(Display.getCurrent());
 	}
 	
 	/*