diff --git a/ide/etmessageframe.pas b/ide/etmessageframe.pas
index 210d7c3591..308a3ca77b 100644
--- a/ide/etmessageframe.pas
+++ b/ide/etmessageframe.pas
@@ -32,14 +32,19 @@ unit etMessageFrame;
 interface
 
 uses
-  Math, strutils, Classes, SysUtils, UTF8Process, FileProcs, LazFileCache,
+  Math, strutils, Classes, SysUtils,
+  UTF8Process, FileProcs, LazFileCache,
   LazUTF8Classes, LazFileUtils, LazUTF8, AvgLvlTree, SynEdit,
-  SynEditMarks, LResources, Forms, Buttons, ExtCtrls, Controls, LMessages,
+  LResources, Forms, Buttons, ExtCtrls, Controls, LMessages,
   LCLType, Graphics, LCLIntf, Themes, ImgList, GraphType, Menus, Clipbrd,
-  Dialogs, StdCtrls, IDEExternToolIntf, IDEImagesIntf, MenuIntf, PackageIntf,
-  IDECommands, IDEDialogs, ProjectIntf, CompOptsIntf,
+  Dialogs, StdCtrls,
+  SynEditMarks,
+  // IDEIntf
+  IDEExternToolIntf, IDEImagesIntf, MenuIntf, PackageIntf,
+  IDECommands, IDEDialogs, ProjectIntf, CompOptsIntf, LazIDEIntf,
+  // IDE
   LazarusIDEStrConsts, EnvironmentOpts, HelpFPCMessages, etSrcEditMarks,
-  etQuickFixes, ExtTools, IDEOptionDefs, CompilerOptions;
+  MsgWnd_Options, etQuickFixes, ExtTools, IDEOptionDefs, CompilerOptions;
 
 const
   CustomViewCaption = '------------------------------';
@@ -330,6 +335,7 @@ type
     procedure FilterMsgOfTypeMenuItemClick(Sender: TObject);
     procedure FilterUrgencyMenuItemClick(Sender: TObject);
     procedure HideSearchSpeedButtonClick(Sender: TObject);
+    procedure MoreOptionsMenuItemClick(Sender: TObject);
     procedure MsgCtrlPopupMenuPopup(Sender: TObject);
     procedure OnSelectFilterClick(Sender: TObject);
     procedure OpenToolsOptionsMenuItemClick(Sender: TObject);
@@ -445,6 +451,7 @@ var
       MsgFileStyleFullMenuItem: TIDEMenuCommand;
     MsgTranslateMenuItem: TIDEMenuCommand;
     MsgShowIDMenuItem: TIDEMenuCommand;
+    MsgMoreOptionsMenuItem: TIDEMenuCommand;
 
 procedure RegisterStandardMessagesViewMenuItems;
 
@@ -556,6 +563,8 @@ begin
       lisTranslateTheEnglishMessages);
     MsgShowIDMenuItem:=RegisterIDEMenuCommand(Parent, 'ShowID',
       lisShowMessageTypeID);
+    MsgMoreOptionsMenuItem:=RegisterIDEMenuCommand(Parent, 'More Options',
+      lisMore2);
 end;
 
 {$R *.lfm}
@@ -2878,6 +2887,7 @@ begin
     MsgTranslateMenuItem.OnClick:=@TranslateMenuItemClick;
     MsgShowIDMenuItem.Checked:=mcoShowMessageID in MessagesCtrl.Options;
     MsgShowIDMenuItem.OnClick:=@ShowIDMenuItemClick;
+    MsgMoreOptionsMenuItem.OnClick:=@MoreOptionsMenuItemClick;
 
     UpdateRemoveCompOptHideMsgItems;
     UpdateRemoveMsgTypeFilterItems;
@@ -3152,6 +3162,11 @@ begin
   HideSearch;
 end;
 
+procedure TMessagesFrame.MoreOptionsMenuItemClick(Sender: TObject);
+begin
+  LazarusIDE.DoOpenIDEOptions(TMsgWndOptionsFrame);
+end;
+
 procedure TMessagesFrame.CopyFilenameMenuItemClick(Sender: TObject);
 begin
   CopyMsgToClipboard(true);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 55d847b3c0..2eae2af482 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -560,6 +560,7 @@ resourcestring
   lisFull = 'Full';
   lisTranslateTheEnglishMessages = 'Translate the English Messages';
   lisShowMessageTypeID = 'Show Message Type ID';
+  lisMore2 = 'More ...';
   lisToolStoppedWithExitCodeUseContextMenuToGetMoreInfo = 'tool stopped with '
     +'exit code %s. Use context menu to get more information.';
   lisErrors2 = ', Errors: %s';
diff --git a/ide/main.pp b/ide/main.pp
index 736e26e77c..98978797f9 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -365,7 +365,6 @@ type
 
     // options menu
     procedure mnuEnvGeneralOptionsClicked(Sender: TObject);
-    procedure mnuEnvEditorOptionsClicked(Sender: TObject);
     procedure mnuEnvCodeTemplatesClicked(Sender: TObject);
     procedure mnuEnvCodeToolsDefinesEditorClicked(Sender: TObject);
     procedure mnuEnvRescanFPCSrcDirClicked(Sender: TObject);
@@ -2145,7 +2144,6 @@ begin
   SourceEditorManager.OnClearBookmarkId := @OnSrcNotebookEditorClearBookmarkId;
   SourceEditorManager.OnSetBookmark := @OnSrcNotebookEditorDoSetBookmark;
   SourceEditorManager.OnGotoBookmark := @OnSrcNotebookEditorDoGotoBookmark;
-  SourceEditorManager.OnEditorPropertiesClicked := @mnuEnvEditorOptionsClicked;
   SourceEditorManager.OnFindDeclarationClicked := @OnSrcNotebookFindDeclaration;
   SourceEditorManager.OnInitIdentCompletion :=@OnSrcNotebookInitIdentCompletion;
   SourceEditorManager.OnShowCodeContext :=@OnSrcNotebookShowCodeContext;
@@ -5090,11 +5088,6 @@ begin
     DlgCompPagesPopup.Close;
 end;
 
-procedure TMainIDE.mnuEnvEditorOptionsClicked(Sender: TObject);
-begin
-  DoOpenIDEOptions(TEditorGeneralOptionsFrame);
-end;
-
 procedure TMainIDE.mnuEnvCodeTemplatesClicked(Sender: TObject);
 begin
   if ShowCodeTemplateDialog=mrOk then begin
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index e3efd47e6d..6c2722d5c1 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -66,6 +66,7 @@ uses
   IDEOptionDefs, IDEHelpManager, MacroPromptDlg, TransferMacros,
   CodeContextForm, SrcEditHintFrm, etMessagesWnd, etSrcEditMarks, InputHistory,
   CodeMacroPrompt, CodeTemplatesDlg, CodeToolsOptions,
+  editor_general_options,
   SortSelectionDlg, EncloseSelectionDlg, ConDef, InvertAssignTool,
   SourceEditProcs, SourceMarks, CharacterMapDlg, SearchFrm,
   FPDocHints, EditorMacroListViewer,
@@ -1105,7 +1106,6 @@ type
     FOnCloseClicked: TOnCloseSrcEditor;
     FOnDeleteLastJumpPoint: TNotifyEvent;
     FOnEditorMoved: TNotifyEvent;
-    FOnEditorPropertiesClicked: TNotifyEvent;
     FOnFindDeclarationClicked: TNotifyEvent;
     FOnGetIndent: TOnGetIndentEvent;
     FOnGotoBookmark: TBookMarkActionEvent;
@@ -1140,8 +1140,6 @@ type
              read FOnDeleteLastJumpPoint write FOnDeleteLastJumpPoint;
     property OnEditorMoved: TNotifyEvent
              read FOnEditorMoved write FOnEditorMoved;
-    property OnEditorPropertiesClicked: TNotifyEvent
-             read FOnEditorPropertiesClicked write FOnEditorPropertiesClicked;
     property OnFindDeclarationClicked: TNotifyEvent
              read FOnFindDeclarationClicked write FOnFindDeclarationClicked;
     property OnInitIdentCompletion: TOnInitIdentCompletion
@@ -10500,8 +10498,7 @@ end;
 
 procedure TSourceEditorManager.EditorPropertiesClicked(Sender: TObject);
 begin
-  if Assigned(OnEditorPropertiesClicked) then
-    OnEditorPropertiesClicked(Sender);
+  LazarusIDE.DoOpenIDEOptions(TEditorGeneralOptionsFrame);
 end;
 
 initialization