diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 14df947a3da..54b4028c5de 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-10 Alain Magloire
+
+	Move from working in progress the checkbox
+	enable/disable editor problem annotation.
+
+	* src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationblock.java
+	* src/org/eclipse/cdt/internal/ui/preferences/WorkingInProgressPreferencePage.java
+	* src/org/eclipse/cdt/ui/PrefencecConstants.java
+	
 2004-06-09 Alain Magloire
 
 	Patch from Sam Rob to resolve 64022
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java
index 05bcd7d5181..52900d66f2e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java
@@ -149,6 +149,7 @@ public class CEditorHoverConfigurationBlock {
 	private TableColumn fModifierColumn;
 	private Text fDescription;
 	//private Button fShowHoverAffordanceCheckbox;
+	private Button fShowEditorAnnotationCheckbox;
 	
 	private CEditorPreferencePage fMainPreferencePage;
 
@@ -181,8 +182,8 @@ public class CEditorHoverConfigurationBlock {
 		ArrayList overlayKeys= new ArrayList();
 	
 		//overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_ANNOTATION_ROLL_OVER));
-
 		//overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS));
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS));
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS));
 		
@@ -212,10 +213,15 @@ public class CEditorHoverConfigurationBlock {
 		// Affordance checkbox
 		//fShowHoverAffordanceCheckbox= new Button(hoverComposite, SWT.CHECK);
 		//fShowHoverAffordanceCheckbox.setText(PreferencesMessages.getString("CEditorHoverConfigurationBlock.showAffordance")); //$NON-NLS-1$
+		//fShowHoverAffordanceCheckbox.setLayoutData(gd);
+		
+		// Disable/enable editor problem annotaion checkbox
+		fShowEditorAnnotationCheckbox = new Button(hoverComposite, SWT.CHECK);
+		fShowEditorAnnotationCheckbox.setText(PreferencesMessages.getString("CEditorPreferencePage.behaviourPage.EnableEditorProblemAnnotation")); //$NON-NLS-1$
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
 		gd.horizontalIndent= 0;
 		gd.horizontalSpan= 2;
-		//fShowHoverAffordanceCheckbox.setLayoutData(gd);
+		fShowEditorAnnotationCheckbox.setLayoutData(gd);
 
 		addFiller(hoverComposite);
 
@@ -396,7 +402,8 @@ public class CEditorHoverConfigurationBlock {
 
 	void initializeFields() {
 		//fShowHoverAffordanceCheckbox.setSelection(fStore.getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
-
+		
+		fShowEditorAnnotationCheckbox.setSelection(fStore.getBoolean(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS));
 		fModifierEditor.setEnabled(false);
 		
 		Iterator e= fCheckBoxes.keySet().iterator();
@@ -435,7 +442,7 @@ public class CEditorHoverConfigurationBlock {
 		fStore.setValue(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS, maskBuf.toString());
 		
 		//fStore.setValue(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE, fShowHoverAffordanceCheckbox.getSelection());
-		
+		fStore.setValue(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, fShowEditorAnnotationCheckbox.getSelection());
 		CUIPlugin.getDefault().resetCEditorTextHoverDescriptors();
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java
index 791a22ab0df..30de0f2742d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java
@@ -13,7 +13,6 @@ import org.eclipse.cdt.core.browser.AllTypesCache;
 import org.eclipse.cdt.internal.core.search.indexing.SourceIndexer;
 import org.eclipse.cdt.internal.ui.search.CSearchPage;
 import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.cdt.utils.ui.controls.ControlFactory;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -48,7 +47,6 @@ public class WorkInProgressPreferencePage extends PreferencePage
 	private Button fExternEnabled;
 	private Button fIProblemMarkers;
 	private Button fBackgroundTypeCacheEnabled;
-	private Button fEditorCorrection;
 	
 	
 	protected OverlayPreferenceStore fOverlayStore;
@@ -67,7 +65,6 @@ public class WorkInProgressPreferencePage extends PreferencePage
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, CSearchPage.EXTERNALMATCH_VISIBLE));
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, SourceIndexer.CDT_INDEXER_TIMEOUT));
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS));
 		
         OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
 		overlayKeys.toArray(keys);
@@ -151,16 +148,6 @@ public class WorkInProgressPreferencePage extends PreferencePage
 		editorCorrectionGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		editorCorrectionGroup.setText("Editor"); //$NON-NLS-1$
 
-		fEditorCorrection = createCheckButton(editorCorrectionGroup, "Enable editor problem annotation"); //$NON-NLS-1$
-		fEditorCorrection.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				Button button = (Button) e.widget;
-				fOverlayStore.setValue(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, button.getSelection());
-			}
-		});
-	
 		initialize(); 
 		
 		return result;
@@ -178,7 +165,6 @@ public class WorkInProgressPreferencePage extends PreferencePage
 		
 		fBackgroundTypeCacheEnabled.setSelection(fOverlayStore.getBoolean(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE));
 		
-		fEditorCorrection.setSelection(fOverlayStore.getBoolean(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS));
 	}
 	
 	/* (non-Javadoc)
@@ -235,10 +221,10 @@ public class WorkInProgressPreferencePage extends PreferencePage
 	public boolean performOk() {
 		
 		String timeOut = fTextControl.getText();
-		try{
-			Integer timeInt = new Integer(timeOut);
-		}
-		catch (NumberFormatException ex){
+		try {
+			// Check the string number
+			Integer.parseInt(timeOut);
+		} catch (NumberFormatException ex){
 			timeOut = TIMEOUT_VALUE;
 		}
 		
@@ -253,8 +239,6 @@ public class WorkInProgressPreferencePage extends PreferencePage
 
 		prefs.setValue(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE, fOverlayStore.getString(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE));
 
-		prefs.setValue(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, fOverlayStore.getString(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS));
-
 		CCorePlugin.getDefault().savePluginPreferences();
 		
 		return true;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java
index 26a507ec7d5..051cb32d214 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java
@@ -263,7 +263,7 @@ public class PreferenceConstants {
         store.setDefault(PreferenceConstants.EDITOR_TASK_TAG_BOLD, true);
 
 		store.setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, false);
-		store.setDefault(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, false);
+		store.setDefault(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, true);
 
 		String mod1Name= Action.findModifierString(SWT.MOD1);	// SWT.COMMAND on Mac; SWT.CONTROL elsewhere
 		store.setDefault(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS, "org.eclipse.cdt.ui.BestMatchHover;0;org.eclipse.cdt.ui.CSourceHover;" + mod1Name); //$NON-NLS-1$