diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp
index 5e2c58412b..cf0d62f45a 100644
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@@ -43,7 +43,7 @@ uses
   SynEditMiscClasses, SynBeautifier, SynEditTextTrimmer, SynEditMouseCmds,
   SynPluginTemplateEdit, SynPluginSyncroEdit,
   SynGutter, SynGutterBase, SynGutterCodeFolding, SynGutterLineNumber,
-  SynGutterChanges,
+  SynGutterChanges, SynCompletion,
   SynEditMarkupBracket, SynEditMarkupHighAll, SynEditMarkupWordGroup,
   // SynEdit Highlighters
   SynEditHighlighter, SynEditHighlighterFoldBase,
@@ -925,6 +925,8 @@ type
 
   TEditorOptions = class(TAbstractIDEEnvironmentOptions)
   private
+    FCompletionLongLineHintInMSec: Integer;
+    FCompletionLongLineHintType: TSynComletionLongHintType;
     FHideSingleTabInWindow: Boolean;
     xmlconfig: TRttiXMLConfig;
 
@@ -1141,6 +1143,11 @@ type
       read fCTemplIndentToTokenStart write fCTemplIndentToTokenStart;
     property AutoRemoveEmptyMethods: Boolean read FAutoRemoveEmptyMethods
       write FAutoRemoveEmptyMethods default False;
+    property CompletionLongLineHintInMSec: Integer
+             read FCompletionLongLineHintInMSec write FCompletionLongLineHintInMSec;
+    property CompletionLongLineHintType: TSynComletionLongHintType
+             read FCompletionLongLineHintType write FCompletionLongLineHintType
+             default sclpExtendRightOnly;
 
     // Code Folding
     property UseCodeFolding: Boolean
@@ -3213,6 +3220,7 @@ begin
   FMarkupCurWordNoTimer := False;
 
   // Code Tools options
+  FCompletionLongLineHintType := sclpExtendRightOnly;
 
   // code templates (dci file)
   fCodeTemplateFileName :=
@@ -3438,6 +3446,11 @@ begin
       'EditorOptions/CodeTools/CodeTemplateIndentToTokenStart/Value', False);
     fAutoRemoveEmptyMethods :=
       XMLConfig.GetValue('EditorOptions/CodeTools/AutoRemoveEmptyMethods', False);
+    FCompletionLongLineHintInMSec :=
+      XMLConfig.GetValue('EditorOptions/CodeTools/CompletionLongLineHintInMSec', 0);
+    FCompletionLongLineHintType := sclpExtendRightOnly;
+    XMLConfig.ReadObject('EditorOptions/CodeTools/CompletionLongLineHintType',
+                         Self, Self, 'CompletionLongLineHintType');
 
     // Code Folding
     FUseCodeFolding :=
@@ -3611,6 +3624,11 @@ begin
     XMLConfig.SetDeleteValue(
       'EditorOptions/CodeTools/AutoRemoveEmptyMethods'
       , fAutoRemoveEmptyMethods, False);
+    XMLConfig.SetDeleteValue(
+      'EditorOptions/CodeTools/CompletionLongLineHintInMSec',
+      FCompletionLongLineHintInMSec, 0);
+    XMLConfig.WriteObject('EditorOptions/CodeTools/CompletionLongLineHintType',
+                         Self, nil, 'CompletionLongLineHintType');
 
     // Code Folding
     XMLConfig.SetDeleteValue('EditorOptions/CodeFolding/UseCodeFolding',
diff --git a/ide/frames/editor_codetools_options.lfm b/ide/frames/editor_codetools_options.lfm
index cfed2033f2..c39e737e5e 100644
--- a/ide/frames/editor_codetools_options.lfm
+++ b/ide/frames/editor_codetools_options.lfm
@@ -1,112 +1,56 @@
 inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
   Height = 492
   Width = 634
+  AutoScroll = True
   ClientHeight = 492
   ClientWidth = 634
-  TabOrder = 0
   Visible = False
-  DesignLeft = 348
-  DesignTop = 245
-  object AutoDelayMaxLabel: TLabel[0]
-    AnchorSideTop.Control = AutoDelayTrackBar
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 532
-    Height = 14
-    Top = 164
-    Width = 96
-    Alignment = taRightJustify
-    Anchors = [akTop, akRight]
-    BorderSpacing.Top = 2
-    BorderSpacing.Right = 6
-    Caption = 'AutoDelayMaxLabel'
-    ParentColor = False
-  end
-  object AutoDelayMinLabel: TLabel[1]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = AutoDelayTrackBar
-    AnchorSideTop.Side = asrBottom
-    Left = 6
-    Height = 14
-    Top = 164
-    Width = 92
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 2
-    Caption = 'AutoDelayMinLabel'
-    ParentColor = False
-  end
-  object AutoDelayLabel: TLabel[2]
-    AnchorSideLeft.Control = AutoDelayMinLabel
+  DesignLeft = 263
+  DesignTop = 222
+  object AutoDelayLabel: TLabel[0]
+    AnchorSideLeft.Control = AutoHintAndCompletionDelayLabel
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = AutoDelayMinLabel
-    AnchorSideTop.Side = asrCenter
-    Left = 104
-    Height = 14
-    Top = 164
-    Width = 76
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 24
+    AnchorSideTop.Control = AutoHintAndCompletionDelayLabel
+    Left = 218
+    Height = 16
+    Top = 115
+    Width = 84
+    BorderSpacing.Left = 20
     Caption = 'AutoDelayLabel'
     ParentColor = False
   end
-  object MarkupWordMinLabel: TLabel[3]
+  object MarkupWordDelayLabel: TLabel[1]
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = MarkupWordTimeTrackBar
-    AnchorSideTop.Side = asrBottom
-    Left = 6
-    Height = 14
-    Top = 342
-    Width = 130
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 2
-    Caption = 'MarkupWordDelayMinLabel'
-    ParentColor = False
-  end
-  object MarkupWordMaxLabel: TLabel[4]
     AnchorSideTop.Control = MarkupWordTimeTrackBar
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 494
-    Height = 14
-    Top = 342
-    Width = 134
-    Alignment = taRightJustify
-    Anchors = [akTop, akRight]
+    AnchorSideBottom.Control = MarkupWordTimeTrackBar
+    Left = 500
+    Height = 16
+    Top = 350
+    Width = 128
+    Anchors = [akRight, akBottom]
+    BorderSpacing.Left = 6
     BorderSpacing.Top = 2
     BorderSpacing.Right = 6
-    Caption = 'MarkupWordDelayMaxLabel'
-    ParentColor = False
-  end
-  object MarkupWordDelayLabel: TLabel[5]
-    AnchorSideLeft.Control = MarkupWordMinLabel
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = MarkupWordMinLabel
-    AnchorSideTop.Side = asrCenter
-    Left = 142
-    Height = 14
-    Top = 342
-    Width = 114
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 24
     Caption = 'MarkupWordDelayLabel'
     ParentColor = False
   end
-  object MarkupWordFullLenLabel: TLabel[6]
+  object MarkupWordFullLenLabel: TLabel[2]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MarkupWordFullLenSpin
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = MarkupWordFullLenSpin
     Left = 6
-    Height = 14
-    Top = 276
-    Width = 120
+    Height = 16
+    Top = 346
+    Width = 137
     BorderSpacing.Left = 6
     Caption = 'MarkupWordFullLenLabel'
     ParentColor = False
   end
-  object MarkupWordBevel: TBevel[7]
+  object MarkupWordBevel: TBevel[3]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MarkupWordGroupLabel
     AnchorSideTop.Side = asrCenter
@@ -114,12 +58,12 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 190
+    Top = 253
     Width = 60
     BorderSpacing.Top = 6
     BorderSpacing.Bottom = 6
   end
-  object ToolTipBevel: TBevel[8]
+  object ToolTipBevel: TBevel[4]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoCompleteBlockCheckBox
     AnchorSideTop.Side = asrBottom
@@ -127,21 +71,21 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 98
+    Top = 106
     Width = 634
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
     BorderSpacing.Bottom = 6
   end
-  object MarkupWordGroupLabel: TLabel[9]
+  object MarkupWordGroupLabel: TLabel[5]
     AnchorSideLeft.Control = MarkupWordBevel
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = AutoDelayLabel
+    AnchorSideTop.Control = CompletionDropDownHint
     AnchorSideTop.Side = asrBottom
     Left = 66
-    Height = 14
-    Top = 184
-    Width = 138
+    Height = 16
+    Top = 246
+    Width = 139
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'MarkupWordGroupLabel'
@@ -149,59 +93,59 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
     ParentColor = False
     ParentFont = False
   end
-  object MarkupWordBevel1: TBevel[10]
+  object MarkupWordBevel1: TBevel[6]
     AnchorSideLeft.Control = MarkupWordGroupLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = MarkupWordGroupLabel
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 210
+    Left = 211
     Height = 3
-    Top = 190
-    Width = 424
+    Top = 253
+    Width = 423
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     BorderSpacing.Bottom = 6
   end
-  object MarkupBevel: TBevel[11]
+  object MarkupBevel: TBevel[7]
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = MarkupWordDelayLabel
+    AnchorSideTop.Control = MarkupWordTimeTrackBar
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 362
+    Top = 408
     Width = 634
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
     BorderSpacing.Bottom = 6
   end
-  object BracketLabel: TLabel[12]
+  object BracketLabel: TLabel[8]
     AnchorSideLeft.Control = BracketCombo
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = BracketCombo
     AnchorSideTop.Side = asrCenter
     Left = 162
-    Height = 14
-    Top = 374
-    Width = 62
+    Height = 16
+    Top = 420
+    Width = 68
     BorderSpacing.Around = 6
     Caption = 'BracketLabel'
     ParentColor = False
   end
-  object BracketLink: TLabel[13]
+  object BracketLink: TLabel[9]
     AnchorSideLeft.Control = BracketLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = BracketLabel
     AnchorSideTop.Side = asrCenter
     Cursor = crHandPoint
-    Left = 230
-    Height = 14
-    Top = 374
-    Width = 55
+    Left = 236
+    Height = 16
+    Top = 420
+    Width = 62
     BorderSpacing.Around = 6
     Caption = 'BracketLink'
     Font.Color = clBlue
@@ -211,16 +155,16 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
     OnMouseEnter = BracketLinkMouseEnter
     OnMouseLeave = BracketLinkMouseLeave
   end
-  object MarkupColorLink: TLabel[14]
+  object MarkupColorLink: TLabel[10]
     AnchorSideLeft.Control = MarkupWordNoTimerCheckBox
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = MarkupWordNoTimerCheckBox
     AnchorSideTop.Side = asrCenter
     Cursor = crHandPoint
-    Left = 177
-    Height = 14
-    Top = 205
-    Width = 55
+    Left = 201
+    Height = 16
+    Top = 269
+    Width = 62
     BorderSpacing.Left = 6
     Caption = 'BracketLink'
     Font.Color = clBlue
@@ -230,70 +174,71 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
     OnMouseEnter = BracketLinkMouseEnter
     OnMouseLeave = BracketLinkMouseLeave
   end
-  object AutoRemoveEmptyMethodsOnSave: TCheckBox[15]
+  object AutoRemoveEmptyMethodsOnSave: TCheckBox[11]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 6
-    Height = 17
+    Height = 19
     Top = 6
-    Width = 189
+    Width = 210
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'AutoRemoveEmptyMethodsOnSave'
     TabOrder = 0
   end
-  object AutoToolTipSymbToolsCheckBox: TCheckBox[16]
+  object AutoToolTipSymbToolsCheckBox: TCheckBox[12]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoRemoveEmptyMethodsOnSave
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 17
-    Top = 29
-    Width = 173
+    Height = 19
+    Top = 31
+    Width = 198
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'AutoToolTipSymbToolsCheckBox'
     TabOrder = 1
   end
-  object AutoCompleteBlockCheckBox: TCheckBox[17]
+  object AutoCompleteBlockCheckBox: TCheckBox[13]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoToolTipExprEvalCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 17
-    Top = 75
-    Width = 157
+    Height = 19
+    Top = 81
+    Width = 179
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'AutoCompleteBlockCheckBox'
     TabOrder = 2
   end
-  object AutoToolTipExprEvalCheckBox: TCheckBox[18]
+  object AutoToolTipExprEvalCheckBox: TCheckBox[14]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoToolTipSymbToolsCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 17
-    Top = 52
-    Width = 164
+    Height = 19
+    Top = 56
+    Width = 182
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'AutoToolTipExprEvalCheckBox'
     TabOrder = 3
   end
-  object AutoDelayTrackBar: TTrackBar[19]
+  object AutoDelayTrackBar: TTrackBar[15]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoHintAndCompletionDelayLabel
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 40
-    Top = 122
+    Height = 30
+    Top = 132
     Width = 622
     Frequency = 250
     Max = 4000
     Min = 500
+    OnChange = AutoDelayTrackBarChange
     Position = 500
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -301,19 +246,20 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
     BorderSpacing.Right = 6
     TabOrder = 4
   end
-  object MarkupWordTimeTrackBar: TTrackBar[20]
+  object MarkupWordTimeTrackBar: TTrackBar[16]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MarkupWordFullLenSpin
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 40
-    Top = 300
+    Height = 30
+    Top = 372
     Width = 622
     Frequency = 250
     Max = 4000
     Min = 500
+    OnChange = AutoDelayTrackBarChange
     Position = 500
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -321,89 +267,166 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
     BorderSpacing.Right = 6
     TabOrder = 5
   end
-  object MarkupWordNoKeyword: TCheckBox[21]
+  object MarkupWordNoKeyword: TCheckBox[17]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MarkupWordNoTimerCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 17
-    Top = 227
-    Width = 134
+    Height = 19
+    Top = 293
+    Width = 152
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'MarkupWordNoKeyword'
     TabOrder = 6
   end
-  object MarkupWordFullLenSpin: TSpinEdit[22]
+  object MarkupWordFullLenSpin: TSpinEdit[18]
     AnchorSideLeft.Control = MarkupWordFullLenLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = MarkupWordTrim
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 132
-    Height = 21
-    Top = 273
+    Left = 149
+    Height = 23
+    Top = 343
     Width = 48
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     TabOrder = 7
   end
-  object MarkupWordNoTimerCheckBox: TCheckBox[23]
+  object MarkupWordNoTimerCheckBox: TCheckBox[19]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MarkupWordGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 17
-    Top = 204
-    Width = 165
+    Height = 19
+    Top = 268
+    Width = 189
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'MarkupWordNoTimerCheckBox'
     TabOrder = 8
   end
-  object MarkupWordTrim: TCheckBox[24]
+  object MarkupWordTrim: TCheckBox[20]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MarkupWordNoKeyword
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 17
-    Top = 250
-    Width = 99
+    Height = 19
+    Top = 318
+    Width = 115
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'MarkupWordTrim'
     TabOrder = 9
   end
-  object BracketCombo: TComboBox[25]
+  object BracketCombo: TComboBox[21]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MarkupBevel
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 21
-    Top = 371
+    Height = 23
+    Top = 417
     Width = 150
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
-    ItemHeight = 13
+    ItemHeight = 15
     OnChange = BracketComboChange
     OnExit = BracketComboExit
     OnKeyDown = BracketComboKeyDown
     Style = csDropDownList
     TabOrder = 10
   end
-  object AutoHintAndCompletionDelayLabel: TLabel[26]
+  object AutoHintAndCompletionDelayLabel: TLabel[22]
     AnchorSideLeft.Control = ToolTipBevel
     AnchorSideTop.Control = ToolTipBevel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 14
-    Top = 107
-    Width = 167
+    Height = 16
+    Top = 115
+    Width = 192
     BorderSpacing.Left = 6
     Caption = 'AutoHintAndCompletionDelayLabel'
     ParentColor = False
   end
+  object CompletionDropDownHintTrackBar: TTrackBar[23]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CompletionDropDownLabel
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 30
+    Top = 185
+    Width = 622
+    Frequency = 250
+    Max = 4000
+    OnChange = AutoDelayTrackBarChange
+    Position = 0
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 1
+    BorderSpacing.Right = 6
+    TabOrder = 11
+  end
+  object CompletionDropDownLabel: TLabel[24]
+    AnchorSideLeft.Control = ToolTipBevel
+    AnchorSideTop.Control = AutoDelayTrackBar
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 16
+    Top = 168
+    Width = 149
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    Caption = 'CompletionDropDownLabel'
+    ParentColor = False
+  end
+  object CompletionDropDownDelayLabel: TLabel[25]
+    AnchorSideLeft.Control = CompletionDropDownLabel
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CompletionDropDownLabel
+    Left = 175
+    Height = 16
+    Top = 168
+    Width = 178
+    BorderSpacing.Left = 20
+    Caption = 'CompletionDropDownDelayLabel'
+    ParentColor = False
+  end
+  object CompletionDropDownHint: TComboBox[26]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CompletionDropDownHintTrackBar
+    AnchorSideTop.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 6
+    Height = 23
+    Top = 217
+    Width = 150
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 2
+    ItemHeight = 15
+    OnChange = BracketComboChange
+    OnExit = BracketComboExit
+    OnKeyDown = BracketComboKeyDown
+    Style = csDropDownList
+    TabOrder = 12
+  end
+  object CompletionDropDownHintLabel: TLabel[27]
+    AnchorSideLeft.Control = CompletionDropDownHint
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CompletionDropDownHint
+    AnchorSideTop.Side = asrCenter
+    Left = 162
+    Height = 16
+    Top = 220
+    Width = 172
+    BorderSpacing.Around = 6
+    Caption = 'CompletionDropDownHintLabel'
+    ParentColor = False
+  end
 end
diff --git a/ide/frames/editor_codetools_options.pas b/ide/frames/editor_codetools_options.pas
index be6f9dc942..66580d482d 100644
--- a/ide/frames/editor_codetools_options.pas
+++ b/ide/frames/editor_codetools_options.pas
@@ -25,10 +25,10 @@ unit editor_codetools_options;
 interface
 
 uses
-  Classes, StdCtrls, ComCtrls, Graphics,
+  Classes, StdCtrls, ComCtrls, Graphics, sysutils,
   EditorOptions, LazarusIDEStrConsts, IDEOptionsIntf, Spin, ExtCtrls,
   SynEditMarkupBracket, editor_color_options, editor_general_options,
-  SynEdit, LCLType;
+  SynEdit, SynCompletion, LCLType;
 
 type
   { TEditorCodetoolsOptionsFrame }
@@ -36,9 +36,12 @@ type
   TEditorCodetoolsOptionsFrame = class(TAbstractIDEOptionsEditor)
     AutoCompleteBlockCheckBox: TCheckBox;
     AutoDelayLabel: TLabel;
-    AutoDelayMaxLabel: TLabel;
-    AutoDelayMinLabel: TLabel;
+    CompletionDropDownHintLabel: TLabel;
+    CompletionDropDownHint: TComboBox;
+    CompletionDropDownDelayLabel: TLabel;
     AutoDelayTrackBar: TTrackBar;
+    CompletionDropDownLabel: TLabel;
+    CompletionDropDownHintTrackBar: TTrackBar;
     AutoToolTipExprEvalCheckBox: TCheckBox;
     BracketCombo: TComboBox;
     BracketLabel: TLabel;
@@ -54,13 +57,12 @@ type
     MarkupWordFullLenSpin: TSpinEdit;
     MarkupWordFullLenLabel: TLabel;
     MarkupWordNoKeyword: TCheckBox;
-    MarkupWordMaxLabel: TLabel;
-    MarkupWordMinLabel: TLabel;
     MarkupWordTrim: TCheckBox;
     MarkupWordTimeTrackBar: TTrackBar;
     AutoToolTipSymbToolsCheckBox: TCheckBox;
     AutoRemoveEmptyMethodsOnSave: TCheckBox;
     MarkupBevel: TBevel;
+    procedure AutoDelayTrackBarChange(Sender: TObject);
     procedure BracketComboChange(Sender: TObject);
     procedure BracketComboExit(Sender: TObject);
     procedure BracketComboKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -92,6 +94,15 @@ begin
     BracketComboExit(Sender);
 end;
 
+procedure TEditorCodetoolsOptionsFrame.AutoDelayTrackBarChange(Sender: TObject);
+begin
+  AutoDelayLabel.Caption := Format(dlgEdDelayInSec, [FormatFloat('0.00', AutoDelayTrackBar.Position/1000)]);
+  MarkupWordDelayLabel.Caption :=
+    Format(dlgEdDelayInSec, [FormatFloat('0.00', MarkupWordTimeTrackBar.Position/1000)]);
+  CompletionDropDownDelayLabel.Caption :=
+    Format(dlgEdDelayInSec, [FormatFloat('0.00', CompletionDropDownHintTrackBar.Position/1000)]);
+end;
+
 procedure TEditorCodetoolsOptionsFrame.BracketComboExit(Sender: TObject);
 var
   a: Integer;
@@ -169,14 +180,15 @@ begin
   AutoCompleteBlockCheckBox.Caption := dlgEdCompleteBlocks;
 
   AutoHintAndCompletionDelayLabel.Caption:=lisDelayForHintsAndCompletionBox;
-  AutoDelayLabel.Caption := dlgEdDelay;
-  AutoDelayMinLabel.Caption := '0.5 ' + DlgTimeSecondUnit;
-  AutoDelayMaxLabel.Caption := '4.0 ' + dlgTimeSecondUnit;
+  CompletionDropDownLabel.Caption := lisDelayForCompletionLongLineHint;
+  CompletionDropDownHintLabel.Caption := lisCompletionLongLineHintType;
+  CompletionDropDownHint.Clear;
+  CompletionDropDownHint.Items.Add(lisCompletionLongLineHintTypeNone);
+  CompletionDropDownHint.Items.Add(lisCompletionLongLineHintTypeRightOnly);
+  CompletionDropDownHint.Items.Add(lisCompletionLongLineHintTypeLittleLeft);
+  CompletionDropDownHint.Items.Add(lisCompletionLongLineHintTypeFullLeft);
 
   MarkupWordGroupLabel.Caption := dlgMarkupGroup;
-  MarkupWordDelayLabel.Caption := dlgEdDelay;
-  MarkupWordMinLabel.Caption := '0.5 ' + DlgTimeSecondUnit;;
-  MarkupWordMaxLabel.Caption := '4.0 ' + DlgTimeSecondUnit;;
   MarkupWordFullLenLabel.Caption := dlgMarkupWordFullLen;
   MarkupWordNoKeyword.Caption := dlgMarkupWordNoKeyword;
   MarkupWordTrim.Caption := dlgMarkupWordTrim;
@@ -200,6 +212,10 @@ begin
     AutoToolTipSymbToolsCheckBox.Checked := AutoToolTipSymbTools;
     AutoDelayTrackBar.Position := AutoDelayInMSec;
     AutoRemoveEmptyMethodsOnSave.Checked := AutoRemoveEmptyMethods;
+
+    CompletionDropDownHintTrackBar.Position := CompletionLongLineHintInMSec;
+    CompletionDropDownHint.ItemIndex := ord(CompletionLongLineHintType);
+
     MarkupWordTimeTrackBar.Position := MarkupCurWordTime;
     MarkupWordFullLenSpin. Value := MarkupCurWordFullLen;
     MarkupWordNoKeyword.Checked := MarkupCurWordNoKeyword;
@@ -211,6 +227,7 @@ begin
     else
       BracketCombo.ItemIndex := 0;
   end;
+  AutoDelayTrackBarChange(nil);
 end;
 
 procedure TEditorCodetoolsOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
@@ -222,6 +239,10 @@ begin
     AutoToolTipSymbTools := AutoToolTipSymbToolsCheckBox.Checked;
     AutoDelayInMSec := AutoDelayTrackBar.Position;
     AutoRemoveEmptyMethods := AutoRemoveEmptyMethodsOnSave.Checked;
+
+    CompletionLongLineHintInMSec := CompletionDropDownHintTrackBar.Position;
+    CompletionLongLineHintType :=  TSynComletionLongHintType(CompletionDropDownHint.ItemIndex);
+
     MarkupCurWordTime := MarkupWordTimeTrackBar.Position;
     MarkupCurWordFullLen := MarkupWordFullLenSpin.Value;
     MarkupCurWordNoKeyword := MarkupWordNoKeyword.Checked;
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 5a7f014278..6f7996c488 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1432,7 +1432,14 @@ resourcestring
   dlgAutoRemoveEmptyMethods = 'Auto remove empty methods';
   lisShowDeclarationHints = 'Show declaration hints';
   dlgEdDelay = 'Delay';
+  dlgEdDelayInSec = '(%s sec delay)';
   lisDelayForHintsAndCompletionBox = 'Delay for hints and completion box';
+  lisDelayForCompletionLongLineHint = 'Delay for long line hints in completion box';
+  lisCompletionLongLineHintType = 'Show long line hints';
+  lisCompletionLongLineHintTypeNone = 'Never';
+  lisCompletionLongLineHintTypeRightOnly = 'Extend right only';
+  lisCompletionLongLineHintTypeLittleLeft = 'Extend some left';
+  lisCompletionLongLineHintTypeFullLeft = 'Extend far left';
   dlgTimeSecondUnit = 'sec';
   dlgEdCodeTempl = 'Code templates';
   dlgTplFName = 'Template file name';
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index ffdd427af6..122f4af10c 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -8082,6 +8082,8 @@ begin
   Result := FDefaultCompletionForm;
   if Result <> nil then exit;
   FDefaultCompletionForm := TSourceEditCompletion.Create(Self);
+  FDefaultCompletionForm.LongLineHintTime := EditorOpts.CompletionLongLineHintInMSec;
+  FDefaultCompletionForm.LongLineHintType := EditorOpts.CompletionLongLineHintType;
   Result := FDefaultCompletionForm;
   for i:=0 to SourceEditorCount - 1 do
     FDefaultCompletionForm.AddEditor(TSourceEditor(SourceEditors[i]).EditorComponent);
@@ -8501,6 +8503,10 @@ begin
     IndentToTokenStart:=EditorOpts.CodeTemplateIndentToTokenStart;
   end;
 
+  if FDefaultCompletionForm <> nil then begin
+    FDefaultCompletionForm.LongLineHintTime := EditorOpts.CompletionLongLineHintInMSec;
+    FDefaultCompletionForm.LongLineHintType := EditorOpts.CompletionLongLineHintType;
+  end;
 end;
 
 procedure TSourceEditorManager.FindClicked(Sender: TObject);