diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index d44eab6e..e3145bbd 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -250,12 +250,12 @@ end;
 
 procedure TCEEditorWidget.projCompile(const aProject: TCEProject);
 begin
-  stopUpdateByDelay;
+  endUpdateByDelay;
 end;
 
 procedure TCEEditorWidget.projRun(const aProject: TCEProject);
 begin
-  stopUpdateByDelay;
+  endUpdateByDelay;
 end;
 
 procedure TCEEditorWidget.getSymbolLoc;
diff --git a/src/ce_main.lfm b/src/ce_main.lfm
index 7deeed65..695b7a0c 100644
--- a/src/ce_main.lfm
+++ b/src/ce_main.lfm
@@ -460,6 +460,42 @@ object CEMainForm: TCEMainForm
       end
       object MenuItem60: TMenuItem
         Action = actFileOpenContFold
+        Bitmap.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000000000000000
+          0033000000330000003300000033000000330000003300000033000000330000
+          0033000000330000003300000033000000330000003300000030A9988BC0B6A3
+          93FFB5A293FFB5A293FFB5A393FFB6A392FFB6A393FFB6A393FFB5A393FFB5A2
+          93FFB6A394FFB7A596FFB7A495FFB7A494FFB7A596FFB7A495F2B6A393FFFFFF
+          FDFFF5EBE0FFF5EBE0FFF6ECDFFFFAF0DEFFFBF1DFFFF8EEE0FFF5EBE1FFF4EA
+          E0FFF5F1EEFFB3A090FFE9DED2FFE8DED1FFE9DFD3FFB7A495FFB5A191FFFFFF
+          FBFFACAEB0FFACAEAFFFFAEFDDFF5B57DEFF5D58DFFFB1B4AEFFACAEAFFFCDCB
+          C6FFF7F2EFFFB19C8BFFF6F2EBFF73706DFFF9F4EEFFB6A393FFB5A191FFFFFF
+          FDFFACAEAFFFF7EDE3FFF9EFDFFF8581F1FF8682F2FFFBF1E0FFF5EBE1FFF2E9
+          E0FFF7F2EEFFB09B8BFFFFFFFFFFFFFFFFFFFFFFFFFFB6A393FFB5A191FFFFFF
+          FFFFADAEAFFFFAF0E8FFFAEFE3FFFFF4E0FFFFF5E1FFFCF1E5FFF7EEE5FFF5EC
+          E5FFFFFEFDFFB19D8CFFB29E8DFFB19D8CFFB39F8EFFB7A595FFB4A191FFFFFF
+          FFFFADAEAFFFACACADFFFFF1E7FF45ACF9FF47ADFAFFB2ADAAFFAAABACFFCAC8
+          C5FFFCFAF8FFB19C8CFFE5DCD3FFE3DAD1FFE6DDD5FFB7A494FFB4A190FFFFFF
+          FFFFACADAEFFFEF6EEFFFFF4E9FF45C4FAFF46C5FBFFFFF5EBFFFBF3ECFFF8F1
+          EBFFFFFFFFFFAF9B8AFFEEE6DEFFECE4DCFFEFE8DFFFB5A393FFB4A190FFFFFF
+          FFFFACADAEFFFEF8F2FFFDF5EFFFFFF8F1FFFFF9F2FFFFF7F1FFFBF5F0FFF9F4
+          EEFFFFFFFFFFAF9B8AFFE7DED5FFE6DCD2FFE9E0D6FFB5A393FFB4A090FFFFFF
+          FFFFACADAEFFA9AAACFFFEF9F7FFCCA983FFCFAB85FFA9ACAFFFA8A9AAFFD1D0
+          CEFFFEFEFDFFB09B8BFFE3D8CCFFE2D6CAFFE5D9CDFFB6A394FFB4A090FFFFFF
+          FFFFAAAAABFFFFFDF9FFFEFCFAFFDCBC94FFDDBD94FFFEFDFAFFFDFAF6FFFBF9
+          F4FFFFFFFFFFB19C8CFFDFD3C4FFDED1C3FFE0D4C6FFB7A596FFB4A090FFFFFF
+          FFFFFFFFFFFFFFFAFAFFFEFAF9FFFFFFFFFFFFFEFEFFF8F5F4FFFCF8F7FFFCF9
+          F7FFFFFFFFFFB19D8CFFB4A091FFB4A091FFB5A292FFB6A394F3B4A090FFFFFF
+          FFFF4FB592FF6AB49BFFAFAAADFFA8A8A9FFD2D2D2FFF8F6F5FFFDF9F8FFFDFA
+          F9FFFFFFFFFFB09B8AFFE7DDD1FFE8DDD1FFE9DED2FFB7A494FFB5A090FFFFFF
+          FFFF50C08BFF51C18BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFEFDFFFFFF
+          FEFFFFFFFFFFAF9A89FFF6F2EBFF73706DFFF9F4EEFFB6A393FFB5A292FFFFFF
+          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+          FFFFFFFFFFFFB19C8BFFFFFFFFFFFFFFFFFFFFFFFFFFB6A393FFB8A596EFB5A2
+          92FFB5A090FFB4A090FFB49F8FFFB39F8EFFB39F8EFFB39F8EFFB39F8EFFB39F
+          8FFFB4A191FFB6A393FFB5A292FFB4A191FFBBA99AFFB8A696B0
+        }
       end
     end
     object MenuItem7: TMenuItem
@@ -1268,6 +1304,42 @@ object CEMainForm: TCEMainForm
       end
       object MenuItem61: TMenuItem
         Action = actProjOpenContFold
+        Bitmap.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000000000000000
+          0033000000330000003300000033000000330000003300000033000000330000
+          0033000000330000003300000033000000330000003300000030A9988BC0B6A3
+          93FFB5A293FFB5A293FFB5A393FFB6A392FFB6A393FFB6A393FFB5A393FFB5A2
+          93FFB6A394FFB7A596FFB7A495FFB7A494FFB7A596FFB7A495F2B6A393FFFFFF
+          FDFFF5EBE0FFF5EBE0FFF6ECDFFFFAF0DEFFFBF1DFFFF8EEE0FFF5EBE1FFF4EA
+          E0FFF5F1EEFFB3A090FFE9DED2FFE8DED1FFE9DFD3FFB7A495FFB5A191FFFFFF
+          FBFFACAEB0FFACAEAFFFFAEFDDFF5B57DEFF5D58DFFFB1B4AEFFACAEAFFFCDCB
+          C6FFF7F2EFFFB19C8BFFF6F2EBFF73706DFFF9F4EEFFB6A393FFB5A191FFFFFF
+          FDFFACAEAFFFF7EDE3FFF9EFDFFF8581F1FF8682F2FFFBF1E0FFF5EBE1FFF2E9
+          E0FFF7F2EEFFB09B8BFFFFFFFFFFFFFFFFFFFFFFFFFFB6A393FFB5A191FFFFFF
+          FFFFADAEAFFFFAF0E8FFFAEFE3FFFFF4E0FFFFF5E1FFFCF1E5FFF7EEE5FFF5EC
+          E5FFFFFEFDFFB19D8CFFB29E8DFFB19D8CFFB39F8EFFB7A595FFB4A191FFFFFF
+          FFFFADAEAFFFACACADFFFFF1E7FF45ACF9FF47ADFAFFB2ADAAFFAAABACFFCAC8
+          C5FFFCFAF8FFB19C8CFFE5DCD3FFE3DAD1FFE6DDD5FFB7A494FFB4A190FFFFFF
+          FFFFACADAEFFFEF6EEFFFFF4E9FF45C4FAFF46C5FBFFFFF5EBFFFBF3ECFFF8F1
+          EBFFFFFFFFFFAF9B8AFFEEE6DEFFECE4DCFFEFE8DFFFB5A393FFB4A190FFFFFF
+          FFFFACADAEFFFEF8F2FFFDF5EFFFFFF8F1FFFFF9F2FFFFF7F1FFFBF5F0FFF9F4
+          EEFFFFFFFFFFAF9B8AFFE7DED5FFE6DCD2FFE9E0D6FFB5A393FFB4A090FFFFFF
+          FFFFACADAEFFA9AAACFFFEF9F7FFCCA983FFCFAB85FFA9ACAFFFA8A9AAFFD1D0
+          CEFFFEFEFDFFB09B8BFFE3D8CCFFE2D6CAFFE5D9CDFFB6A394FFB4A090FFFFFF
+          FFFFAAAAABFFFFFDF9FFFEFCFAFFDCBC94FFDDBD94FFFEFDFAFFFDFAF6FFFBF9
+          F4FFFFFFFFFFB19C8CFFDFD3C4FFDED1C3FFE0D4C6FFB7A596FFB4A090FFFFFF
+          FFFFFFFFFFFFFFFAFAFFFEFAF9FFFFFFFFFFFFFEFEFFF8F5F4FFFCF8F7FFFCF9
+          F7FFFFFFFFFFB19D8CFFB4A091FFB4A091FFB5A292FFB6A394F3B4A090FFFFFF
+          FFFF4FB592FF6AB49BFFAFAAADFFA8A8A9FFD2D2D2FFF8F6F5FFFDF9F8FFFDFA
+          F9FFFFFFFFFFB09B8AFFE7DDD1FFE8DDD1FFE9DED2FFB7A494FFB5A090FFFFFF
+          FFFF50C08BFF51C18BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFEFDFFFFFF
+          FEFFFFFFFFFFAF9A89FFF6F2EBFF73706DFFF9F4EEFFB6A393FFB5A292FFFFFF
+          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+          FFFFFFFFFFFFB19C8BFFFFFFFFFFFFFFFFFFFFFFFFFFB6A393FFB8A596EFB5A2
+          92FFB5A090FFB4A090FFB49F8FFFB39F8EFFB39F8EFFB39F8EFFB39F8EFFB39F
+          8FFFB4A191FFB6A393FFB5A292FFB4A191FFBBA99AFFB8A696B0
+        }
       end
       object MenuItem40: TMenuItem
         Caption = '-'
diff --git a/src/ce_main.pas b/src/ce_main.pas
index 586f4141..41546e67 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -729,9 +729,9 @@ procedure TCEMainForm.ApplicationProperties1ShowHint(var HintStr: string;
   var CanShow: Boolean; var HintInfo: THintInfo);
 begin
   CanShow := true;
-  if EditWidget.currentEditor <> nil then
+  {if EditWidget.currentEditor <> nil then
     if EditWidget.currentEditor.Focused then
-      HintStr := EditWidget.getEditorHint;
+      HintStr := EditWidget.getEditorHint;}
 end;
 {$ENDREGION}
 
@@ -1088,6 +1088,7 @@ begin
         dt^.editor := EditWidget.currentEditor
       else
         dt^.ctxt := mcEditor;
+      fEditWidg.endUpdatebyDelay; // messages would be cleared by the delayed module name detection.
       fMesgWidg.addMessage(msg, dt);
       application.ProcessMessages;
     end;