diff --git a/components/ideintf/idemsgintf.pas b/components/ideintf/idemsgintf.pas
index f34c780b48..749e67d58b 100644
--- a/components/ideintf/idemsgintf.pas
+++ b/components/ideintf/idemsgintf.pas
@@ -75,6 +75,7 @@ type
     procedure DeleteView(View: TExtToolView); virtual; abstract; // free view
     function IndexOfView(View: TExtToolView): integer; virtual; abstract;
 
+    procedure SelectMsgLine(Msg: TMessageLine); virtual; abstract;
     function SelectFirstUrgentMessage(aMinUrgency: TMessageLineUrgency;
       WithSrcPos: boolean): boolean; virtual; abstract;
     function SelectNextUrgentMessage(aMinUrgency: TMessageLineUrgency;
diff --git a/ide/etmessageframe.pas b/ide/etmessageframe.pas
index 00cc19cc48..1aecb6e762 100644
--- a/ide/etmessageframe.pas
+++ b/ide/etmessageframe.pas
@@ -193,11 +193,12 @@ type
     mcoShowStats, // show numbers of errors, warnings and hints in view header line
     mcoShowTranslated, // show translation (e.g. messages from German message file)
     mcoShowMessageID,  // show message ID
-    mcoAutoOpenFirstError // when all views stopped, open first error
+    mcoAutoOpenFirstError, // when all views stopped, open first error
+    mcoShowMsgIcons
     );
   TMsgCtrlOptions = set of TMsgCtrlOption;
 const
-  MCDefaultOptions = [mcoShowStats,mcoShowTranslated,mcoAutoOpenFirstError];
+  MCDefaultOptions = [mcoShowStats,mcoShowTranslated,mcoAutoOpenFirstError,mcoShowMsgIcons];
 
 type
 
@@ -327,6 +328,7 @@ type
     function SearchNext(StartView: TLMsgWndView; StartLine: integer;
       SkipStart, Downwards: boolean;
       out View: TLMsgWndView; out LineNumber: integer): boolean;
+    procedure Select(Msg: TMessageLine; DoScroll: boolean);
     function SelectNextOccurence(Downwards: boolean): boolean;
     function SelectNextShown(Offset: integer): boolean;
     function SelectLast(DoScroll, FullyVisible: boolean): boolean;
@@ -479,10 +481,12 @@ type
     procedure ApplySrcChangeds(Changes: TETSrcChanges);
 
     // message lines
+    procedure SelectMsgLine(Msg: TMessageLine; DoScroll: boolean);
     function SelectFirstUrgentMessage(aMinUrgency: TMessageLineUrgency;
       WithSrcPos: boolean): boolean;
     function SelectNextUrgentMessage(aMinUrgency: TMessageLineUrgency;
       WithSrcPos, Downwards: boolean): boolean;
+    procedure ClearCustomMessages(const ViewCaption: string='');
     function AddCustomMessage(TheUrgency: TMessageLineUrgency; Msg: string;
       aFilename: string = ''; LineNumber: integer = 0; Column: integer = 0;
       const ViewCaption: string = CustomViewCaption): TMessageLine;
@@ -1448,7 +1452,7 @@ begin
   if FOptions=NewOptions then Exit;
   ChangedOptions:=(FOptions-NewOptions)+(NewOptions-FOptions);
   FOptions:=NewOptions;
-  if [mcoShowStats,mcoShowTranslated,mcoShowMessageID]*ChangedOptions<>[] then
+  if [mcoShowStats,mcoShowTranslated,mcoShowMessageID,mcoShowMsgIcons]*ChangedOptions<>[] then
     Invalidate;
 end;
 
@@ -1842,7 +1846,8 @@ begin
           SecondLineIsNotSelectedMessage:=true;
       end;
       ImgIndex:=fUrgencyStyles[Line.Urgency].ImageIndex;
-      if (Images<>nil) and (ImgIndex>=0) and (ImgIndex<Images.Count) then begin
+      if (Images<>nil) and (mcoShowMsgIcons in Options)
+      and (ImgIndex>=0) and (ImgIndex<Images.Count) then begin
         Images.Draw(Canvas,
           NodeRect.Left + 1, (NodeRect.Top + NodeRect.Bottom - Images.Height) div 2,
           ImgIndex, gdeNormal);
@@ -2136,6 +2141,22 @@ begin
   until not Next;
 end;
 
+procedure TMessagesCtrl.Select(Msg: TMessageLine; DoScroll: boolean);
+begin
+  BeginUpdate;
+  if (Msg=nil) or (Msg.Lines=nil) or (not (Msg.Lines.Owner is TLMsgWndView))
+  then begin
+    SelectedView:=nil;
+    SelectedLine:=-1;
+  end else begin
+    SelectedView:=TLMsgWndView(Msg.Lines.Owner);
+    SelectedLine:=Msg.Index;
+    if DoScroll then
+      ScrollToLine(SelectedView,SelectedLine,true);
+  end;
+  EndUpdate;
+end;
+
 function TMessagesCtrl.SelectNextOccurence(Downwards: boolean): boolean;
 var
   View: TLMsgWndView;
@@ -3494,6 +3515,11 @@ begin
   MessagesCtrl.ApplySrcChanges(Changes);
 end;
 
+procedure TMessagesFrame.SelectMsgLine(Msg: TMessageLine; DoScroll: boolean);
+begin
+  MessagesCtrl.Select(Msg,DoScroll);
+end;
+
 function TMessagesFrame.GetDefaultSearchText: string;
 begin
   Result:='(Search)';
@@ -3511,6 +3537,17 @@ begin
   Result:=MessagesCtrl.SelectNextUrgentMessage(aMinUrgency,WithSrcPos,Downwards);
 end;
 
+procedure TMessagesFrame.ClearCustomMessages(const ViewCaption: string);
+var
+  View: TLMsgWndView;
+begin
+  View:=GetView(ViewCaption,false);
+  if (View=nil) or (View.Lines.Count=0) then exit;
+  View.Lines.Clear;
+  MessagesCtrl.UpdateScrollBar(true);
+  MessagesCtrl.Invalidate;
+end;
+
 function TMessagesFrame.AddCustomMessage(TheUrgency: TMessageLineUrgency;
   Msg: string; aFilename: string; LineNumber: integer; Column: integer;
   const ViewCaption: string): TMessageLine;
diff --git a/ide/etmessageswnd.pas b/ide/etmessageswnd.pas
index 6221080c13..17f6fcc12d 100644
--- a/ide/etmessageswnd.pas
+++ b/ide/etmessageswnd.pas
@@ -52,11 +52,14 @@ type
     ImgIDError: integer;
     ImgIDFatal: integer;
     function GetDblClickJumps: boolean;
+    function GetHideMessagesIcons: boolean;
     procedure SetDblClickJumps(AValue: boolean);
+    procedure SetHideMessagesIcons(AValue: boolean);
   protected
     function GetViews(Index: integer): TExtToolView; override;
   public
     SourceMarks: TETMarks;
+    procedure ClearCustomMessages(const ViewCaption: string='');
     function AddCustomMessage(TheUrgency: TMessageLineUrgency; Msg: string;
       aSrcFilename: string=''; LineNumber: integer=0; Column: integer=0;
       const ViewCaption: string=''): TMessageLine; override;
@@ -67,12 +70,14 @@ type
     function GetView(aCaption: string; CreateIfNotExist: boolean
       ): TExtToolView; override;
     function IndexOfView(View: TExtToolView): integer; override;
+    procedure SelectMsgLine(Msg: TMessageLine); override;
     function SelectFirstUrgentMessage(aMinUrgency: TMessageLineUrgency;
       WithSrcPos: boolean): boolean; override;
     function SelectNextUrgentMessage(aMinUrgency: TMessageLineUrgency;
       WithSrcPos, Downwards: boolean): boolean; override;
     function ViewCount: integer; override;
     property DblClickJumps: boolean read GetDblClickJumps write SetDblClickJumps;
+    property HideMessagesIcons: boolean read GetHideMessagesIcons write SetHideMessagesIcons;
   end;
 
 var
@@ -154,11 +159,24 @@ begin
       MessagesFrame1.MessagesCtrl.Options+[mcoSingleClickOpensFile]
 end;
 
+procedure TMessagesView.SetHideMessagesIcons(AValue: boolean);
+begin
+  if AValue then
+    MessagesFrame1.MessagesCtrl.Options:=MessagesFrame1.MessagesCtrl.Options+[]
+  else
+    MessagesFrame1.MessagesCtrl.Options:=MessagesFrame1.MessagesCtrl.Options-[];
+end;
+
 function TMessagesView.GetViews(Index: integer): TExtToolView;
 begin
   Result:=MessagesFrame1.Views[Index];
 end;
 
+procedure TMessagesView.ClearCustomMessages(const ViewCaption: string);
+begin
+  MessagesFrame1.ClearCustomMessages(ViewCaption);
+end;
+
 function TMessagesView.AddCustomMessage(TheUrgency: TMessageLineUrgency;
   Msg: string; aSrcFilename: string; LineNumber: integer; Column: integer;
   const ViewCaption: string): TMessageLine;
@@ -202,6 +220,11 @@ begin
     Result:=-1;
 end;
 
+procedure TMessagesView.SelectMsgLine(Msg: TMessageLine);
+begin
+  MessagesFrame1.SelectMsgLine(Msg,true);
+end;
+
 function TMessagesView.SelectFirstUrgentMessage(
   aMinUrgency: TMessageLineUrgency; WithSrcPos: boolean): boolean;
 begin
@@ -224,5 +247,10 @@ begin
   Result:=not (mcoSingleClickOpensFile in MessagesFrame1.MessagesCtrl.Options);
 end;
 
+function TMessagesView.GetHideMessagesIcons: boolean;
+begin
+  Result:=mcoShowMsgIcons in MessagesFrame1.MessagesCtrl.Options;
+end;
+
 end.
 
diff --git a/ide/main.pp b/ide/main.pp
index 95b5ef507a..3f95f3c546 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -7843,7 +7843,9 @@ var
   ProgramFilename: string;
   Params: string;
   ExtTool: TIDEExternalToolOptions;
+  {$IFNDEF EnableNewExtTools}
   Filename: String;
+  {$ENDIF}
   DirectiveList: TStringList;
 begin
   Result:=mrCancel;
@@ -8202,6 +8204,7 @@ begin
   begin
     SourceFileMgr.ArrangeSourceEditorAndMessageView(false);
     {$IFDEF EnableNewExtTools}
+    MessagesView.ClearCustomMessages;
     MessagesView.AddCustomMessage(mluImportant,lisMenuQuickSyntaxCheckOk);
     {$ELSE}
     MessagesView.ClearTillLastSeparator;
@@ -8593,16 +8596,23 @@ begin
   if (CmdAfterExe<>'') then begin
     if FileIsExecutableCached(CmdAfterExe) then begin
       Tool:=TIDEExternalToolOptions.Create;
-      Tool.Filename:=CmdAfterExe;
       Tool.Title:=lisCommandAfterPublishingModule;
       Tool.WorkingDirectory:=DestDir;
       Tool.CmdLineParams:=CmdAfterParams;
+      {$IFDEF EnableNewExtTools}
+      Tool.Executable:=CmdAfterExe;
+      if RunExternalTool(Tool) then
+        Result:=mrOk
+      else
+        Result:=mrCancel;
+      {$ELSE}
+      Tool.Filename:=CmdAfterExe;
       Result:=ExternalTools.Run(Tool,GlobalMacroList,false);
       if Result<>mrOk then exit;
+      {$ENDIF}
     end else begin
       ShowErrorForCommandAfter;
-      Result:=mrCancel;
-      exit;
+      exit(mrCancel);
     end;
   end;
 end;
@@ -8925,6 +8935,7 @@ begin
   end;
 end;
 
+{$IFNDEF EnableNewExtTools}
 function GetFPCMessage(ALine: TLazMessageLine; var FileName: String;
   var CaretPos: TPoint; var ErrType: TFPCErrorType): Boolean;
 begin
@@ -8938,6 +8949,7 @@ begin
     Exit;
   ErrType:=FPCErrorTypeNameToType(ALine.Parts.Values['Type']);
 end;
+{$ENDIF}
 
 function TMainIDE.DoJumpToCompilerMessage(FocusEditor: boolean;
   {$IFDEF EnableNewExtTools}
@@ -8947,21 +8959,45 @@ function TMainIDE.DoJumpToCompilerMessage(FocusEditor: boolean;
   {$ENDIF}
   ): boolean;
 var
+  {$IFDEF EnableNewExtTools}
+  {$ELSE}
   MaxMessages: integer;
+  MsgType: TFPCErrorType;
+  MsgLine: TLazMessageLine;
+  CurDir: string;
+  NewFilename: String;
+  {$ENDIF}
   Filename, SearchedFilename: string;
   LogCaretXY: TPoint;
   TopLine: integer;
-  MsgType: TFPCErrorType;
   SrcEdit: TSourceEditor;
   OpenFlags: TOpenFlags;
-  CurDir: string;
-  NewFilename: String;
   AnUnitInfo: TUnitInfo;
   AnEditorInfo: TUnitEditorInfo;
-  MsgLine: TLazMessageLine;
 begin
   Result:=false;
 
+  {$IFDEF EnableNewExtTools}
+  if Msg=nil then begin
+    if MessagesView.SelectFirstUrgentMessage(mluError,true) then
+      Msg:=MessagesView.GetSelectedLine;
+    if (Msg=nil) and MessagesView.SelectFirstUrgentMessage(mluError,false) then
+      Msg:=MessagesView.GetSelectedLine;
+    if Msg=nil then exit;
+  end else begin
+    MessagesView.SelectMsgLine(Msg);
+  end;
+  Msg:=MessagesView.GetSelectedLine;
+  if Msg=nil then exit;
+
+  // first try the plugins
+  if IDEQuickFixes.OpenMsg(Msg) then exit;
+
+  Filename:=Msg.GetFullFilename;
+  LogCaretXY.Y:=Msg.Line;
+  LogCaretXY.X:=Msg.Column;
+
+  {$ELSE}
   MaxMessages:=MessagesView.VisibleItemCount;
   if Index>=MaxMessages then exit;
   if (Index<0) then begin
@@ -8983,77 +9019,80 @@ begin
   // first try the plugins
   if MessagesView.ExecuteMsgLinePlugin(imqfoJump) then exit;
 
-  // default: jump to source position
+  // jump to source position
   MsgLine:=MessagesView.VisibleItems[Index];
-  if GetFPCMessage(MsgLine,Filename,LogCaretXY,MsgType) then begin
-    //debugln(['TMainIDE.DoJumpToCompilerMessage Index=',Index,' MsgFile=',MsgLine.Filename,' MsgY=',MsgLine.LineNumber,' File=',Filename,' XY=',dbgs(LogCaretXY),' ',MsgLine.Parts.Text]);
-    CurDir:=MsgLine.Directory;
-    if (not FilenameIsAbsolute(Filename)) and (CurDir<>'') then begin
-      // the directory was just hidden, re-append it
-      NewFilename:=AppendPathDelim(CurDir)+Filename;
-      if FileExistsUTF8(NewFilename) then
-        Filename:=NewFilename;
-    end;
+  if not GetFPCMessage(MsgLine,Filename,LogCaretXY,MsgType) then exit;
+  //debugln(['TMainIDE.DoJumpToCompilerMessage Index=',Index,' MsgFile=',MsgLine.Filename,' MsgY=',MsgLine.LineNumber,' File=',Filename,' XY=',dbgs(LogCaretXY),' ',MsgLine.Parts.Text]);
+  CurDir:=MsgLine.Directory;
+  if (not FilenameIsAbsolute(Filename)) and (CurDir<>'') then begin
+    // the directory was just hidden, re-append it
+    NewFilename:=AppendPathDelim(CurDir)+Filename;
+    if FileExistsUTF8(NewFilename) then
+      Filename:=NewFilename;
+  end;
+  {$ENDIF}
 
-    OpenFlags:=[ofOnlyIfExists,ofRegularFile];
-    if MainBuildBoss.IsTestUnitFilename(Filename) then begin
-      SearchedFilename := ExtractFileName(Filename);
+  OpenFlags:=[ofOnlyIfExists,ofRegularFile];
+  if MainBuildBoss.IsTestUnitFilename(Filename) then begin
+    SearchedFilename := ExtractFileName(Filename);
+    Include(OpenFlags,ofVirtualFile);
+  end else begin
+    SearchedFilename := FindUnitFile(Filename);
+    if not FilenameIsAbsolute(SearchedFilename) then
       Include(OpenFlags,ofVirtualFile);
-    end else begin
-      SearchedFilename := FindUnitFile(Filename);
-      if not FilenameIsAbsolute(SearchedFilename) then
-        Include(OpenFlags,ofVirtualFile);
-    end;
+  end;
 
-    if SearchedFilename<>'' then begin
-      // open the file in the source editor
-      AnUnitInfo := nil;
-      if Project1<>nil then
-        AnUnitInfo:=Project1.UnitInfoWithFilename(SearchedFilename);
-      AnEditorInfo := nil;
-      if AnUnitInfo <> nil then
-        AnEditorInfo := SourceFileMgr.GetAvailableUnitEditorInfo(AnUnitInfo, LogCaretXY);
-      if AnEditorInfo <> nil then begin
-        SourceEditorManager.ActiveEditor := TSourceEditor(AnEditorInfo.EditorComponent);
-        Result := True;
-      end
-      else
-        Result:=(DoOpenEditorFile(SearchedFilename,-1,-1,OpenFlags)=mrOk);
-      if Result then begin
-        // set caret position
-        SourceEditorManager.AddJumpPointClicked(Self);
-        SrcEdit:=SourceEditorManager.ActiveEditor;
-        if LogCaretXY.Y>SrcEdit.EditorComponent.Lines.Count then
-          LogCaretXY.Y:=SrcEdit.EditorComponent.Lines.Count;
-        if LogCaretXY.X<1 then
-          LogCaretXY.X:=1;
-        TopLine:=LogCaretXY.Y-(SrcEdit.EditorComponent.LinesInWindow div 2);
-        if TopLine<1 then TopLine:=1;
-        if FocusEditor then begin
-          IDEWindowCreators.ShowForm(MessagesView,true);
-          SourceEditorManager.ShowActiveWindowOnTop(True);
-        end;
-        SrcEdit.EditorComponent.LogicalCaretXY:=LogCaretXY;
-        SrcEdit.EditorComponent.TopLine:=TopLine;
-        SrcEdit.CenterCursorHoriz(hcmSoftKeepEOL);
-        SrcEdit.ErrorLine:=LogCaretXY.Y;
-      end;
-    end else begin
-      if FilenameIsAbsolute(Filename) then begin
-        IDEMessageDialog(lisInformation, Format(lisUnableToFindFile, ['"',
-          Filename, '"']), mtInformation,[mbOk])
-      end else if Filename<>'' then begin
-        IDEMessageDialog(lisInformation, Format(
-          lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"',
-          Filename, '"', LineEnding, LineEnding]),
-          mtInformation,[mbOk]);
+  if SearchedFilename<>'' then begin
+    // open the file in the source editor
+    AnUnitInfo := nil;
+    if Project1<>nil then
+      AnUnitInfo:=Project1.UnitInfoWithFilename(SearchedFilename);
+    AnEditorInfo := nil;
+    if AnUnitInfo <> nil then
+      AnEditorInfo := SourceFileMgr.GetAvailableUnitEditorInfo(AnUnitInfo, LogCaretXY);
+    if AnEditorInfo <> nil then begin
+      SourceEditorManager.ActiveEditor := TSourceEditor(AnEditorInfo.EditorComponent);
+      Result := True;
+    end
+    else
+      Result:=(DoOpenEditorFile(SearchedFilename,-1,-1,OpenFlags)=mrOk);
+    if Result then begin
+      // set caret position
+      SourceEditorManager.AddJumpPointClicked(Self);
+      SrcEdit:=SourceEditorManager.ActiveEditor;
+      if LogCaretXY.Y>SrcEdit.EditorComponent.Lines.Count then
+        LogCaretXY.Y:=SrcEdit.EditorComponent.Lines.Count;
+      if LogCaretXY.X<1 then
+        LogCaretXY.X:=1;
+      TopLine:=LogCaretXY.Y-(SrcEdit.EditorComponent.LinesInWindow div 2);
+      if TopLine<1 then TopLine:=1;
+      if FocusEditor then begin
+        IDEWindowCreators.ShowForm(MessagesView,true);
+        SourceEditorManager.ShowActiveWindowOnTop(True);
       end;
+      SrcEdit.EditorComponent.LogicalCaretXY:=LogCaretXY;
+      SrcEdit.EditorComponent.TopLine:=TopLine;
+      SrcEdit.CenterCursorHoriz(hcmSoftKeepEOL);
+      SrcEdit.ErrorLine:=LogCaretXY.Y;
+    end;
+  end else begin
+    if FilenameIsAbsolute(Filename) then begin
+      IDEMessageDialog(lisInformation, Format(lisUnableToFindFile, ['"',
+        Filename, '"']), mtInformation,[mbOk])
+    end else if Filename<>'' then begin
+      IDEMessageDialog(lisInformation, Format(
+        lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"',
+        Filename, '"', LineEnding, LineEnding]),
+        mtInformation,[mbOk]);
     end;
   end;
 end;
 
 procedure TMainIDE.DoJumpToNextError(DirectionDown: boolean);
 var
+  {$IFDEF EnableNewExtTools}
+  Msg: TMessageLine;
+  {$ELSE}
   Index: integer;
   MaxMessages: integer;
   Filename: string;
@@ -9061,7 +9100,15 @@ var
   MsgType: TFPCErrorType;
   OldIndex: integer;
   RoundCount: Integer;
+  {$ENDIF}
 begin
+  {$IFDEF EnableNewExtTools}
+  if not MessagesView.SelectNextUrgentMessage(mluError,true,DirectionDown) then
+    exit;
+  Msg:=MessagesView.GetSelectedLine;
+  if Msg=nil then exit;
+  DoJumpToCompilerMessage(true,Msg);
+  {$ELSE}
   // search relevant message (next error, fatal or panic)
   MaxMessages:=MessagesView.VisibleItemCount;
   OldIndex:=MessagesView.SelectedMessageIndex;
@@ -9092,6 +9139,7 @@ begin
   end;
   MessagesView.SelectedMessageIndex:=Index;
   DoJumpToCompilerMessage(true,Index);
+  {$ENDIF}
 end;
 
 function TMainIDE.DoJumpToSearchResult(FocusEditor: boolean): boolean;
@@ -9169,10 +9217,14 @@ end;
 procedure TMainIDE.DoShowMessagesView(BringToFront: boolean);
 begin
   //debugln('TMainIDE.DoShowMessagesView');
+  {$IFDEF EnableNewExtTools}
+  MessagesView.HideMessagesIcons:=EnvironmentOptions.HideMessagesIcons;
+  {$ELSE}
   if EnvironmentOptions.HideMessagesIcons then
     MessagesView.MessageTreeView.Images := nil
   else
     MessagesView.MessageTreeView.Images := IDEImages.Images_12;
+  {$ENDIF}
 
   // don't move the messagesview, if it was already visible.
   IDEWindowCreators.ShowForm(MessagesView,BringToFront);
@@ -10487,6 +10539,9 @@ var
   ErrorTopLine: integer;
   AnUnitInfo: TUnitInfo;
   AnEditorInfo: TUnitEditorInfo;
+  {$IFDEF EnableNewExtTools}
+  Msg: TMessageLine;
+  {$ENDIF}
 begin
   if CodeToolBoss.ErrorMessage='' then begin
     SourceFileMgr.UpdateSourceNames;
@@ -10496,6 +10551,15 @@ begin
   // syntax error -> show error and jump
   // show error in message view
   SourceFileMgr.ArrangeSourceEditorAndMessageView(false);
+  {$IFDEF EnableNewExtTools}
+  MessagesView.ClearCustomMessages;
+  if CodeToolBoss.ErrorCode<>nil then begin
+    Msg:=MessagesView.AddCustomMessage(mluError,CodeToolBoss.ErrorMessage,
+      CodeToolBoss.ErrorCode.Filename,CodeToolBoss.ErrorLine,CodeToolBoss.ErrorColumn);
+    Msg.Flags:=Msg.Flags+[mlfLeftToken];
+  end else
+    MessagesView.AddCustomMessage(mluError,CodeToolBoss.ErrorMessage);
+  {$ELSE}
   MessagesView.ClearTillLastSeparator;
   MessagesView.AddSeparator;
   if CodeToolBoss.ErrorCode<>nil then begin
@@ -10508,6 +10572,7 @@ begin
   end else
     MessagesView.AddMsg(CodeToolBoss.ErrorMessage,Project1.ProjectDirectory,-1);
   MessagesView.SelectedMessageIndex:=MessagesView.MsgCount-1;
+  {$ENDIF}
 
   // jump to error in source editor
   if CodeToolBoss.ErrorCode<>nil then begin
@@ -12445,7 +12510,9 @@ begin
     SaveEnvironment(true);
 
   GetDefaultProcessList.FreeStoppedProcesses;
+  {$IFNDEF EnableNewExtTools}
   ExternalTools.FreeStoppedProcesses;
+  {$ENDIF}
   if (SplashForm<>nil) then FreeThenNil(SplashForm);
 
   if Assigned(FDesignerToBeFreed) then begin