diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index 8d2688f3..6cf7a95d 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -143,17 +143,14 @@
         <ComponentName Value="CECdbWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_cdbcmd"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\src\ce_common.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_common"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\src\ce_d2syn.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_d2syn"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\src\ce_dcd.pas"/>
@@ -210,6 +207,7 @@
         <ComponentName Value="CEMessagesWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="ce_messages"/>
       </Unit13>
       <Unit14>
         <Filename Value="..\src\ce_miniexplorer.pas"/>
@@ -232,7 +230,6 @@
         <ComponentName Value="CEProcInputWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_procinput"/>
       </Unit17>
       <Unit18>
         <Filename Value="..\src\ce_projconf.pas"/>
@@ -240,12 +237,10 @@
         <ComponentName Value="CEProjectConfigurationWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_projconf"/>
       </Unit18>
       <Unit19>
         <Filename Value="..\src\ce_project.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_project"/>
       </Unit19>
       <Unit20>
         <Filename Value="..\src\ce_projinspect.pas"/>
@@ -269,7 +264,6 @@
       <Unit23>
         <Filename Value="..\src\ce_symstring.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_symstring"/>
       </Unit23>
       <Unit24>
         <Filename Value="..\src\ce_synmemo.pas"/>
@@ -310,7 +304,6 @@
         <ComponentName Value="CETodoListWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_todolist"/>
       </Unit30>
       <Unit31>
         <Filename Value="..\src\ce_inspectors.pas"/>
@@ -323,12 +316,10 @@
         <ComponentName Value="CEOptionEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_optionseditor"/>
       </Unit32>
       <Unit33>
         <Filename Value="..\src\ce_editoroptions.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_editoroptions"/>
       </Unit33>
       <Unit34>
         <Filename Value="..\src\ce_dockoptions.pas"/>
diff --git a/src/ce_messages.lfm b/src/ce_messages.lfm
index 2e6fa9b5..75bfdcda 100644
--- a/src/ce_messages.lfm
+++ b/src/ce_messages.lfm
@@ -2,26 +2,26 @@ inherited CEMessagesWidget: TCEMessagesWidget
   Left = 694
   Height = 172
   Top = 198
-  Width = 739
+  Width = 763
   Caption = 'Messages'
   ClientHeight = 172
-  ClientWidth = 739
+  ClientWidth = 763
   inherited Back: TPanel
     Height = 172
-    Width = 739
+    Width = 763
     ClientHeight = 172
-    ClientWidth = 739
+    ClientWidth = 763
     inherited Content: TPanel
       Height = 172
-      Width = 739
+      Width = 763
       ClientHeight = 172
-      ClientWidth = 739
+      ClientWidth = 763
       PopupMenu = nil
       object List: TTreeView[0]
         Left = 2
         Height = 140
         Top = 30
-        Width = 735
+        Width = 759
         Align = alClient
         BorderSpacing.Around = 2
         DefaultItemHeight = 18
@@ -44,7 +44,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         Left = 2
         Height = 26
         Top = 2
-        Width = 735
+        Width = 759
         AutoSize = True
         BorderSpacing.Around = 2
         ButtonHeight = 24
@@ -167,6 +167,28 @@ inherited CEMessagesWidget: TCEMessagesWidget
           Caption = 'ToolButton1'
           Style = tbsDivider
         end
+        object ToolButton11: TToolButton
+          Left = 553
+          Height = 24
+          Top = 2
+          Width = 5
+          Caption = 'ToolButton11'
+          Style = tbsDivider
+        end
+        object TreeFilterEdit1: TTreeFilterEdit
+          Left = 559
+          Height = 22
+          Top = 3
+          Width = 199
+          ButtonWidth = 23
+          NumGlyphs = 1
+          Align = alRight
+          Anchors = [akTop, akLeft, akRight, akBottom]
+          BorderSpacing.Around = 1
+          MaxLength = 0
+          TabOrder = 1
+          FilteredTreeview = List
+        end
       end
     end
   end
diff --git a/src/ce_messages.pas b/src/ce_messages.pas
index 6c0b2ec3..89253800 100644
--- a/src/ce_messages.pas
+++ b/src/ce_messages.pas
@@ -6,8 +6,9 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, ComCtrls,
-  lcltype, ce_widget, ActnList, Menus, clipbrd, AnchorDocking, Buttons, ce_writableComponent,
-  ce_common, ce_project, ce_synmemo, ce_dlangutils, ce_interfaces, ce_observer;
+  lcltype, ce_widget, ActnList, Menus, clipbrd, AnchorDocking, TreeFilterEdit,
+  Buttons, ce_writableComponent, ce_common, ce_project, ce_synmemo,
+  ce_dlangutils, ce_interfaces, ce_observer;
 
 type
 
@@ -39,6 +40,8 @@ type
     procedure AssignTo(Dest: TPersistent); override;
   end;
 
+  { TCEMessagesWidget }
+
   TCEMessagesWidget = class(TCEWidget, ICEEditableOptions, ICEMultiDocObserver, ICEProjectObserver, ICEMessagesDisplay)
     btnClearCat: TBitBtn;
     imgList: TImageList;
@@ -48,12 +51,14 @@ type
     ToolButton1: TToolButton;
     ToolButton10: TToolButton;
     btnSelMisc: TToolButton;
+    ToolButton11: TToolButton;
     ToolButton2: TToolButton;
     btnSelEdit: TToolButton;
     ToolButton4: TToolButton;
     btnSelProj: TToolButton;
     ToolButton8: TToolButton;
     btnSelApp: TToolButton;
+    TreeFilterEdit1: TTreeFilterEdit;
     procedure ListKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     fActAutoSel: TAction;