diff --git a/components/messagecomposer/messagecomposer.lfm b/components/messagecomposer/messagecomposer.lfm
index 51166f8d99..d475fcdcc5 100644
--- a/components/messagecomposer/messagecomposer.lfm
+++ b/components/messagecomposer/messagecomposer.lfm
@@ -1,22 +1,22 @@
 object FormMessagesComposer: TFormMessagesComposer
   AnchorSideLeft.Side = asrBottom
   Left = 650
-  Height = 552
+  Height = 591
   Top = 195
-  Width = 822
+  Width = 584
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Messages Composer'
-  ClientHeight = 552
-  ClientWidth = 822
+  ClientHeight = 591
+  ClientWidth = 584
   OnCreate = MessagesInitExecute
   Position = poScreenCenter
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
   object CaptionLabel: TLabel
     Left = 6
-    Height = 14
+    Height = 16
     Top = 70
-    Width = 63
+    Width = 71
     Caption = 'CaptionLabel'
     ParentColor = False
   end
@@ -24,18 +24,18 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Control = CaptionEdit
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 14
-    Top = 120
-    Width = 45
+    Height = 16
+    Top = 124
+    Width = 52
     BorderSpacing.Top = 12
     Caption = 'MsgLabel'
     ParentColor = False
   end
   object DlgTypeLabel: TLabel
     Left = 154
-    Height = 14
+    Height = 16
     Top = 70
-    Width = 40
+    Width = 45
     Caption = 'DlgType'
     ParentColor = False
   end
@@ -43,9 +43,9 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Control = HelpCtxBevel
     AnchorSideTop.Side = asrBottom
     Left = 8
-    Height = 14
-    Top = 294
-    Width = 64
+    Height = 16
+    Top = 296
+    Width = 70
     Caption = 'Help Context'
     ParentColor = False
   end
@@ -53,9 +53,9 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Control = HelpContextLabel
     AnchorSideTop.Side = asrCenter
     Left = 103
-    Height = 14
-    Top = 294
-    Width = 69
+    Height = 16
+    Top = 296
+    Width = 77
     Caption = 'Help KeyWord'
     ParentColor = False
   end
@@ -63,9 +63,9 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Control = XSpinEdit
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 258
-    Width = 7
+    Height = 16
+    Top = 261
+    Width = 8
     Caption = 'X'
     ParentColor = False
   end
@@ -74,10 +74,10 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = YSpinEdit
     AnchorSideTop.Side = asrCenter
-    Left = 91
-    Height = 14
-    Top = 258
-    Width = 7
+    Left = 92
+    Height = 16
+    Top = 261
+    Width = 8
     BorderSpacing.Left = 8
     Caption = 'Y'
     ParentColor = False
@@ -86,34 +86,34 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Control = HelpContextSpinEdit
     AnchorSideTop.Side = asrBottom
     Left = 8
-    Height = 14
+    Height = 16
     Top = 344
-    Width = 68
+    Width = 79
     BorderSpacing.Top = 6
     Caption = 'Help FileName'
     ParentColor = False
   end
   object PromptLabel: TLabel
     Left = 16
-    Height = 14
+    Height = 16
     Top = 425
-    Width = 60
+    Width = 69
     Caption = 'PromptLabel'
     ParentColor = False
   end
   object ValueLabel: TLabel
     Left = 16
-    Height = 14
+    Height = 16
     Top = 478
-    Width = 54
+    Width = 57
     Caption = 'Value (var)'
     ParentColor = False
   end
   object DefaultValue: TLabel
     Left = 138
-    Height = 14
+    Height = 16
     Top = 478
-    Width = 36
+    Width = 39
     Caption = 'Default'
     ParentColor = False
   end
@@ -122,7 +122,7 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Side = asrBottom
     Left = 5
     Height = 9
-    Top = 237
+    Top = 243
     Width = 269
     BorderSpacing.Top = 6
     Shape = bsTopLine
@@ -139,15 +139,15 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Side = asrBottom
     Left = 8
     Height = 9
-    Top = 285
+    Top = 287
     Width = 266
     Shape = bsTopLine
   end
   object KindMessageLabel: TLabel
     Left = 6
-    Height = 14
+    Height = 16
     Top = 6
-    Width = 810
+    Width = 572
     Align = alTop
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
@@ -159,8 +159,8 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Control = CaptionLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 21
-    Top = 87
+    Height = 23
+    Top = 89
     Width = 136
     BorderSpacing.Top = 3
     TabOrder = 0
@@ -170,11 +170,11 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Control = DlgTypeLabel
     AnchorSideTop.Side = asrBottom
     Left = 154
-    Height = 21
-    Top = 87
+    Height = 23
+    Top = 89
     Width = 120
     BorderSpacing.Top = 3
-    ItemHeight = 13
+    ItemHeight = 15
     ItemIndex = 0
     Items.Strings = (
       'mtWarning'
@@ -187,182 +187,60 @@ object FormMessagesComposer: TFormMessagesComposer
     TabOrder = 1
     Text = 'mtWarning'
   end
-  object ButtonsCheckGroup: TCheckGroup
-    Left = 285
-    Height = 177
-    Top = 70
-    Width = 216
-    AutoFill = True
-    Caption = 'BUTTONS (TMsgDlgButtons)'
-    ChildSizing.LeftRightSpacing = 6
-    ChildSizing.TopBottomSpacing = 6
-    ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
-    ChildSizing.EnlargeVertical = crsHomogenousChildResize
-    ChildSizing.ShrinkHorizontal = crsScaleChilds
-    ChildSizing.ShrinkVertical = crsScaleChilds
-    ChildSizing.Layout = cclLeftToRightThenTopToBottom
-    ChildSizing.ControlsPerLine = 2
-    Columns = 2
-    Items.Strings = (
-      'mbYes'
-      'mbNo'
-      'mbOK'
-      'mbCancel'
-      'mbAbort'
-      'mbRetry'
-      'mbIgnore'
-      'mbAll'
-      'mbNoToAll'
-      'mbYesToAll'
-      'mbHelp'
-      'mbClose'
-    )
-    OnItemClick = ButtonsCheckGroupItemClick
-    TabOrder = 2
-    Data = {
-      0C000000020203030202020202020202
-    }
-  end
   object HelpContextSpinEdit: TSpinEdit
     AnchorSideTop.Control = HelpContextLabel
     AnchorSideTop.Side = asrBottom
     Left = 8
-    Height = 27
-    Top = 311
+    Height = 23
+    Top = 315
     Width = 61
     BorderSpacing.Top = 3
     MaxValue = 9999
-    TabOrder = 3
+    TabOrder = 2
   end
   object HelpKeyWordEdit: TEdit
     AnchorSideTop.Control = HelpKeyWordLabel
     AnchorSideTop.Side = asrBottom
     Left = 103
-    Height = 21
-    Top = 311
+    Height = 23
+    Top = 315
     Width = 171
     BorderSpacing.Top = 3
-    TabOrder = 4
+    TabOrder = 3
     Text = 'HelpKeyWordEdit'
   end
-  object ButtonsPanel: TPanel
-    Left = 509
-    Height = 177
-    Top = 70
-    Width = 285
-    ClientHeight = 177
-    ClientWidth = 285
-    TabOrder = 5
-    object ButtonsStringGrid: TStringGrid
-      Left = 1
-      Height = 138
-      Top = 1
-      Width = 283
-      Align = alTop
-      ColCount = 2
-      FixedCols = 0
-      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll]
-      RowCount = 4
-      TabOrder = 0
-      OnPickListSelect = UpdateQuestioDlgResultExecute
-      OnSelectEditor = ButtonsStringGridSelectEditor
-      ColWidths = (
-        171
-        104
-      )
-      Cells = (
-        8
-        0
-        0
-        'BUTTONS (array of const)'
-        0
-        1
-        'Yes'
-        0
-        2
-        'No'
-        0
-        3
-        'Cancel'
-        1
-        0
-        'Modal Result'
-        1
-        1
-        'mrYes'
-        1
-        2
-        'mrNo'
-        1
-        3
-        'mrCancel'
-      )
-    end
-    object Panel2: TPanel
-      Left = 1
-      Height = 37
-      Top = 139
-      Width = 283
-      Align = alClient
-      BevelInner = bvLowered
-      BevelOuter = bvSpace
-      ClientHeight = 37
-      ClientWidth = 283
-      TabOrder = 1
-      object BitBtn1: TBitBtn
-        Left = 2
-        Height = 33
-        Top = 2
-        Width = 128
-        Action = AddConst
-        Align = alLeft
-        NumGlyphs = 0
-        TabOrder = 0
-      end
-      object BitBtn2: TBitBtn
-        Left = 153
-        Height = 33
-        Top = 2
-        Width = 128
-        Action = DelConst
-        Align = alRight
-        NumGlyphs = 0
-        TabOrder = 1
-      end
-    end
-  end
   object XSpinEdit: TSpinEdit
     AnchorSideLeft.Control = XLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = PositionBevel
     AnchorSideTop.Side = asrBottom
-    Left = 17
-    Height = 27
-    Top = 252
+    Left = 18
+    Height = 23
+    Top = 258
     Width = 66
     BorderSpacing.Left = 4
     BorderSpacing.Top = 6
     BorderSpacing.Bottom = 6
-    TabOrder = 6
+    TabOrder = 4
   end
   object YSpinEdit: TSpinEdit
     AnchorSideLeft.Control = YLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = XSpinEdit
     AnchorSideTop.Side = asrCenter
-    Left = 102
-    Height = 27
-    Top = 252
+    Left = 104
+    Height = 23
+    Top = 258
     Width = 66
     BorderSpacing.Left = 4
-    TabOrder = 7
+    TabOrder = 5
   end
   object HelpFileNameEdit: TFileNameEdit
     AnchorSideTop.Control = HelpFileNameLabel
     AnchorSideTop.Side = asrBottom
     Left = 8
-    Height = 21
-    Top = 361
+    Height = 23
+    Top = 363
     Width = 244
     DialogOptions = []
     FilterIndex = 0
@@ -371,242 +249,219 @@ object FormMessagesComposer: TFormMessagesComposer
     NumGlyphs = 1
     BorderSpacing.Top = 3
     MaxLength = 0
-    TabOrder = 8
+    TabOrder = 6
   end
   object PromptEdit: TEdit
     AnchorSideTop.Control = PromptLabel
     AnchorSideTop.Side = asrBottom
     Left = 16
-    Height = 21
-    Top = 442
+    Height = 23
+    Top = 444
     Width = 164
     BorderSpacing.Top = 3
-    TabOrder = 9
+    TabOrder = 7
     Text = 'PromptEdit'
   end
   object MaskInputCheckBox: TCheckBox
     AnchorSideTop.Control = PromptEdit
     AnchorSideTop.Side = asrCenter
     Left = 191
-    Height = 17
-    Top = 444
-    Width = 68
+    Height = 19
+    Top = 446
+    Width = 76
     Caption = 'MaskInput'
-    TabOrder = 10
+    TabOrder = 8
   end
   object ValueEdit: TEdit
     AnchorSideTop.Control = ValueLabel
     AnchorSideTop.Side = asrBottom
     Left = 16
-    Height = 21
-    Top = 495
+    Height = 23
+    Top = 497
     Width = 112
     BorderSpacing.Top = 3
-    TabOrder = 11
+    TabOrder = 9
     Text = 'ValueEdit'
   end
   object DefaultEdit: TEdit
     AnchorSideTop.Control = DefaultValue
     AnchorSideTop.Side = asrBottom
     Left = 138
-    Height = 21
-    Top = 495
+    Height = 23
+    Top = 497
     Width = 136
     BorderSpacing.Top = 3
-    TabOrder = 12
+    TabOrder = 10
     Text = 'DefaultEdit'
   end
-  object TestButton: TButton
-    Left = 307
-    Height = 37
-    Top = 501
-    Width = 256
-    Action = Test
-    BorderSpacing.InnerBorder = 4
-    TabOrder = 13
-  end
-  object OkButton: TBitBtn
-    Left = 605
-    Height = 37
-    Top = 501
-    Width = 100
-    AutoSize = True
-    Caption = '&OK'
-    Constraints.MinHeight = 37
-    Constraints.MinWidth = 100
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
-    TabOrder = 14
-  end
-  object CancelButton: TBitBtn
-    AnchorSideLeft.Control = OkButton
-    AnchorSideLeft.Side = asrBottom
-    Left = 709
-    Height = 37
-    Top = 501
-    Width = 100
-    BorderSpacing.Left = 4
-    Cancel = True
-    Caption = 'Cancel'
-    Constraints.MinHeight = 37
-    Constraints.MinWidth = 100
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 15
-  end
   object SourceWrapperGroupBox: TGroupBox
-    Left = 307
-    Height = 221
+    Left = 285
+    Height = 256
     Top = 264
-    Width = 509
+    Width = 285
     Caption = 'SourceWrapperGroupBox'
-    ClientHeight = 203
-    ClientWidth = 505
-    TabOrder = 16
-    object Label1: TLabel
-      Left = 7
-      Height = 14
-      Top = 6
-      Width = 55
-      Caption = '"if" RESULT'
-      ParentColor = False
-    end
-    object StringResultLabel: TLabel
-      AnchorSideTop.Side = asrBottom
-      Left = 9
-      Height = 14
-      Top = 145
-      Width = 69
-      BorderSpacing.Top = 8
-      Caption = 'String RESULT'
-      ParentColor = False
-    end
+    ClientHeight = 238
+    ClientWidth = 281
+    TabOrder = 12
     object IfThenRadioButton: TRadioButton
-      Left = 7
-      Height = 17
-      Top = 72
-      Width = 70
+      Left = 9
+      Height = 19
+      Top = 8
+      Width = 69
       Caption = 'if...then...'
       Checked = True
       OnClick = SetIfOrCaseExecute
-      State = cbChecked
       TabOrder = 0
+      TabStop = True
     end
     object IfThenElseRadioButton: TRadioButton
       AnchorSideTop.Control = IfThenRadioButton
       AnchorSideTop.Side = asrBottom
       Left = 7
-      Height = 17
-      Top = 91
-      Width = 104
+      Height = 19
+      Top = 29
+      Width = 101
       BorderSpacing.Top = 2
       Caption = 'if...then...else ...'
       OnClick = SetIfOrCaseExecute
       TabOrder = 1
-      TabStop = False
     end
     object CaseOfEndRadioButton: TRadioButton
-      Left = 199
-      Height = 17
-      Top = 143
-      Width = 108
+      AnchorSideLeft.Control = IfThenRadioButton
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = IfThenRadioButton
+      Left = 128
+      Height = 19
+      Top = 10
+      Width = 107
+      BorderSpacing.Left = 50
+      BorderSpacing.Top = 2
       Caption = 'case ... of ... end;'
       OnClick = SetIfOrCaseExecute
       TabOrder = 2
-      TabStop = False
     end
     object CaseOfEndElseRadioButton: TRadioButton
+      AnchorSideLeft.Control = CaseOfEndRadioButton
       AnchorSideTop.Control = CaseOfEndRadioButton
       AnchorSideTop.Side = asrBottom
-      Left = 199
-      Height = 17
-      Top = 162
-      Width = 120
+      Left = 128
+      Height = 19
+      Top = 31
+      Width = 116
       BorderSpacing.Top = 2
       Caption = 'case ... of ... else ...'
       OnClick = SetIfOrCaseExecute
       TabOrder = 3
-      TabStop = False
     end
     object BeginEndCheckBox: TCheckBox
-      Left = 385
-      Height = 17
-      Top = 152
-      Width = 80
+      Left = 9
+      Height = 19
+      Top = 56
+      Width = 85
       Caption = 'begin ... end'
       TabOrder = 4
     end
-    object IfResultComboBox: TComboBox
-      AnchorSideTop.Control = Label1
-      AnchorSideTop.Side = asrBottom
-      Left = 7
-      Height = 21
-      Top = 23
-      Width = 175
-      BorderSpacing.Top = 3
-      ItemHeight = 13
-      ItemIndex = 0
-      Items.Strings = (
-        'mbOK'
-        'mbCancel'
-      )
-      Style = csDropDownList
+    object SourceNotebook: TNotebook
+      Left = 0
+      Height = 152
+      Top = 86
+      Width = 281
+      PageIndex = 0
+      Align = alBottom
       TabOrder = 5
-      Text = 'mbOK'
-    end
-    object CaseResultCheckGroup: TCheckGroup
-      AnchorSideLeft.Control = IfResultComboBox
-      AnchorSideLeft.Side = asrBottom
-      Left = 192
-      Height = 118
-      Top = -1
-      Width = 299
-      AutoFill = True
-      BorderSpacing.Left = 10
-      Caption = '"case" RESULT'
-      ChildSizing.LeftRightSpacing = 6
-      ChildSizing.TopBottomSpacing = 6
-      ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
-      ChildSizing.EnlargeVertical = crsHomogenousChildResize
-      ChildSizing.ShrinkHorizontal = crsScaleChilds
-      ChildSizing.ShrinkVertical = crsScaleChilds
-      ChildSizing.Layout = cclLeftToRightThenTopToBottom
-      ChildSizing.ControlsPerLine = 3
-      Columns = 3
-      Items.Strings = (
-        'mbOK'
-        'mbCancel'
-      )
-      TabOrder = 6
-      Data = {
-        020000000302
-      }
-    end
-    object StringResultEdit: TEdit
-      AnchorSideTop.Control = StringResultLabel
-      AnchorSideTop.Side = asrBottom
-      Left = 9
-      Height = 21
-      Top = 162
-      Width = 173
-      BorderSpacing.Top = 3
-      TabOrder = 7
-      Text = 'StringResultEdit'
+      TabStop = True
+      object PageIf: TPage
+        object Label1: TLabel
+          Left = 7
+          Height = 16
+          Top = 6
+          Width = 61
+          Caption = '"if" RESULT'
+          ParentColor = False
+        end
+        object IfResultComboBox: TComboBox
+          AnchorSideTop.Control = Label1
+          AnchorSideTop.Side = asrBottom
+          Left = 7
+          Height = 23
+          Top = 25
+          Width = 175
+          BorderSpacing.Top = 3
+          ItemHeight = 15
+          ItemIndex = 0
+          Items.Strings = (
+            'mbOK'
+            'mbCancel'
+          )
+          Style = csDropDownList
+          TabOrder = 0
+          Text = 'mbOK'
+        end
+      end
+      object PageCase: TPage
+        object CaseResultCheckGroup: TCheckGroup
+          Left = 10
+          Height = 128
+          Top = 0
+          Width = 238
+          Align = alClient
+          AutoFill = True
+          BorderSpacing.Left = 10
+          Caption = '"case" RESULT'
+          ChildSizing.LeftRightSpacing = 6
+          ChildSizing.TopBottomSpacing = 6
+          ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+          ChildSizing.EnlargeVertical = crsHomogenousChildResize
+          ChildSizing.ShrinkHorizontal = crsScaleChilds
+          ChildSizing.ShrinkVertical = crsScaleChilds
+          ChildSizing.Layout = cclLeftToRightThenTopToBottom
+          ChildSizing.ControlsPerLine = 3
+          Columns = 3
+          Items.Strings = (
+            'mbOK'
+            'mbCancel'
+          )
+          TabOrder = 0
+          Data = {
+            020000000302
+          }
+        end
+      end
+      object PageString: TPage
+        object StringResultLabel: TLabel
+          AnchorSideTop.Side = asrBottom
+          Left = 9
+          Height = 16
+          Top = 10
+          Width = 75
+          BorderSpacing.Top = 8
+          Caption = 'String RESULT'
+          ParentColor = False
+        end
+        object StringResultEdit: TEdit
+          AnchorSideTop.Control = StringResultLabel
+          AnchorSideTop.Side = asrBottom
+          Left = 9
+          Height = 23
+          Top = 29
+          Width = 173
+          BorderSpacing.Top = 3
+          TabOrder = 0
+          Text = 'StringResultEdit'
+        end
+      end
     end
   end
   object KindMessageComboBox: TComboBox
     Left = 6
-    Height = 21
-    Top = 24
-    Width = 810
+    Height = 23
+    Top = 26
+    Width = 572
     Align = alTop
     BorderSpacing.Left = 6
     BorderSpacing.Top = 4
     BorderSpacing.Right = 6
-    ItemHeight = 13
+    ItemHeight = 15
     ItemIndex = 0
     Items.Strings = (
       'MessageDlg[Msg, DlgType, Buttons(TMsgDlgButtons), HelpCtx]'
@@ -626,7 +481,7 @@ object FormMessagesComposer: TFormMessagesComposer
     )
     OnChange = MessageSetupExecute
     Style = csDropDownList
-    TabOrder = 17
+    TabOrder = 14
     Text = 'MessageDlg[Msg, DlgType, Buttons(TMsgDlgButtons), HelpCtx]'
   end
   object MsgMemo: TMemo
@@ -634,7 +489,7 @@ object FormMessagesComposer: TFormMessagesComposer
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 94
-    Top = 137
+    Top = 143
     Width = 268
     BorderSpacing.Top = 3
     Lines.Strings = (
@@ -642,9 +497,208 @@ object FormMessagesComposer: TFormMessagesComposer
     )
     OnEditingDone = GetParamsFmtExecute
     ScrollBars = ssAutoVertical
-    TabOrder = 18
+    TabOrder = 11
     WordWrap = False
   end
+  object ButtonsNotebook: TNotebook
+    Left = 285
+    Height = 177
+    Top = 70
+    Width = 285
+    PageIndex = 0
+    TabOrder = 13
+    TabStop = True
+    object Page1: TPage
+      object ButtonsCheckGroup: TCheckGroup
+        Left = 0
+        Height = 177
+        Top = 0
+        Width = 285
+        Align = alClient
+        AutoFill = True
+        Caption = 'BUTTONS (TMsgDlgButtons)'
+        ChildSizing.LeftRightSpacing = 6
+        ChildSizing.TopBottomSpacing = 6
+        ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+        ChildSizing.EnlargeVertical = crsHomogenousChildResize
+        ChildSizing.ShrinkHorizontal = crsScaleChilds
+        ChildSizing.ShrinkVertical = crsScaleChilds
+        ChildSizing.Layout = cclLeftToRightThenTopToBottom
+        ChildSizing.ControlsPerLine = 2
+        Columns = 2
+        Items.Strings = (
+          'mbYes'
+          'mbNo'
+          'mbOK'
+          'mbCancel'
+          'mbAbort'
+          'mbRetry'
+          'mbIgnore'
+          'mbAll'
+          'mbNoToAll'
+          'mbYesToAll'
+          'mbHelp'
+          'mbClose'
+        )
+        OnItemClick = ButtonsCheckGroupItemClick
+        TabOrder = 0
+        Data = {
+          0C000000020203030202020202020202
+        }
+      end
+    end
+    object Page2: TPage
+      object ButtonsPanel: TPanel
+        Left = 0
+        Height = 177
+        Top = 0
+        Width = 285
+        Align = alClient
+        ClientHeight = 177
+        ClientWidth = 285
+        TabOrder = 0
+        object ButtonsStringGrid: TStringGrid
+          Left = 1
+          Height = 138
+          Top = 1
+          Width = 283
+          Align = alTop
+          ColCount = 2
+          FixedCols = 0
+          Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll]
+          RowCount = 4
+          TabOrder = 0
+          OnPickListSelect = UpdateQuestioDlgResultExecute
+          OnSelectEditor = ButtonsStringGridSelectEditor
+          ColWidths = (
+            171
+            104
+          )
+          Cells = (
+            8
+            0
+            0
+            'BUTTONS (array of const)'
+            0
+            1
+            'Yes'
+            0
+            2
+            'No'
+            0
+            3
+            'Cancel'
+            1
+            0
+            'Modal Result'
+            1
+            1
+            'mrYes'
+            1
+            2
+            'mrNo'
+            1
+            3
+            'mrCancel'
+          )
+        end
+        object Panel2: TPanel
+          Left = 1
+          Height = 37
+          Top = 139
+          Width = 283
+          Align = alClient
+          BevelInner = bvLowered
+          BevelOuter = bvSpace
+          ClientHeight = 37
+          ClientWidth = 283
+          TabOrder = 1
+          object BitBtn1: TBitBtn
+            Left = 2
+            Height = 33
+            Top = 2
+            Width = 128
+            Action = AddConst
+            Align = alLeft
+            NumGlyphs = 0
+            TabOrder = 0
+          end
+          object BitBtn2: TBitBtn
+            Left = 153
+            Height = 33
+            Top = 2
+            Width = 128
+            Action = DelConst
+            Align = alRight
+            NumGlyphs = 0
+            TabOrder = 1
+          end
+        end
+      end
+    end
+  end
+  object ButtonPanel: TPanel
+    Left = 0
+    Height = 49
+    Top = 542
+    Width = 584
+    Align = alBottom
+    AutoSize = True
+    BevelOuter = bvNone
+    ClientHeight = 49
+    ClientWidth = 584
+    TabOrder = 15
+    object TestButton: TButton
+      AnchorSideLeft.Control = ButtonPanel
+      AnchorSideTop.Control = ButtonPanel
+      Left = 6
+      Height = 37
+      Top = 6
+      Width = 256
+      Action = Test
+      BorderSpacing.Around = 6
+      BorderSpacing.InnerBorder = 4
+      TabOrder = 0
+    end
+    object OkButton: TBitBtn
+      AnchorSideRight.Control = CancelButton
+      Left = 372
+      Height = 37
+      Top = 6
+      Width = 100
+      Anchors = [akTop, akRight]
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = '&OK'
+      Constraints.MinHeight = 37
+      Constraints.MinWidth = 100
+      Default = True
+      Kind = bkOK
+      ModalResult = 1
+      NumGlyphs = 0
+      TabOrder = 1
+    end
+    object CancelButton: TBitBtn
+      AnchorSideLeft.Control = OkButton
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideRight.Control = ButtonPanel
+      AnchorSideRight.Side = asrBottom
+      Left = 478
+      Height = 37
+      Top = 6
+      Width = 100
+      Anchors = [akTop, akRight]
+      BorderSpacing.Around = 6
+      Cancel = True
+      Caption = 'Cancel'
+      Constraints.MinHeight = 37
+      Constraints.MinWidth = 100
+      Kind = bkCancel
+      ModalResult = 2
+      NumGlyphs = 0
+      TabOrder = 2
+    end
+  end
   object ActionList1: TActionList
     left = 456
     top = 368
diff --git a/components/messagecomposer/messagecomposer.pas b/components/messagecomposer/messagecomposer.pas
index 16d341b773..caa5454a38 100644
--- a/components/messagecomposer/messagecomposer.pas
+++ b/components/messagecomposer/messagecomposer.pas
@@ -37,6 +37,14 @@ type
     KindMessageComboBox: TComboBox;
     KindMessageLabel: TLabel;
     MsgMemo: TMemo;
+    ButtonsNotebook: TNotebook;
+    PageString: TPage;
+    ButtonPanel: TPanel;
+    SourceNotebook: TNotebook;
+    Page1: TPage;
+    Page2: TPage;
+    PageIf: TPage;
+    PageCase: TPage;
     UpdateQuestioDlgResult: TAction;
     SetIfOrCase: TAction;
     PositionBevel: TBevel;
@@ -475,6 +483,10 @@ procedure TFormMessagesComposer.MessageSetupExecute(Sender: TObject);
 var indx: integer;
     ListResult: TStringList;
 begin
+  if KindMessageComboBox.ItemIndex in [0,1,2,3,4] then
+    ButtonsNotebook.PageIndex := 0 // ButtonsCheckGroup
+  else
+    ButtonsNotebook.PageIndex := 1; // ButtonsPanel
 //Msg
   case KindMessageComboBox.ItemIndex of
     0,1,2,3,4,5,6,7,8,9: begin
@@ -508,15 +520,6 @@ begin
       DlgTypeComboBox.Enabled := false;
     end;
   end;
-//BUTTONS (TMsgDlgButtons)
-  case KindMessageComboBox.ItemIndex of
-    0,1,2,3,4: begin
-      ButtonsCheckGroup.Enabled := true;
-    end;
-    else begin
-      ButtonsCheckGroup.Enabled := false;
-    end;
-  end;
 //HelpContext
   case KindMessageComboBox.ItemIndex of
     0,1,3,4,5: begin
@@ -565,17 +568,6 @@ begin
       HelpFileNameEdit.Enabled := false;
     end;
   end;
-//Params BUTTONS (array of const)
-  case KindMessageComboBox.ItemIndex of
-    5,6,8: begin
-      ButtonsPanel.Enabled := true;
-      ButtonsStringGrid.Color := clWindow;
-    end;
-    else begin
-      ButtonsPanel.Enabled := false;
-      ButtonsStringGrid.Color := clBtnFace;
-    end;
-  end;
 //Params (array of const)
   case KindMessageComboBox.ItemIndex of
     8: begin
@@ -636,22 +628,28 @@ begin
 //InputBox(); PasswordBox();
   case KindMessageComboBox.ItemIndex of
     12,13: begin
-      StringResultEdit.Enabled := true;
-      StringResultEdit.Color := clWindow;
-      IfResultComboBox.Enabled := false;
-      IfResultComboBox.Color := clBtnFace;
-      CaseResultCheckGroup.Enabled := false;
-      CaseOfEndElseRadioButton.Enabled := false;
-      CaseOfEndRadioButton.Enabled := false;
+      SourceNotebook.PageIndex := 2;
+      //StringResultEdit.Enabled := true;
+      //StringResultEdit.Color := clWindow;
+      //IfResultComboBox.Enabled := false;
+      //IfResultComboBox.Color := clBtnFace;
+      //CaseResultCheckGroup.Enabled := false;
+      //CaseOfEndElseRadioButton.Enabled := false;
+      //CaseOfEndRadioButton.Enabled := false;
+    end;
+    else begin
+      if IfThenRadioButton.Checked or IfThenElseRadioButton.Checked then
+        SourceNotebook.PageIndex := 0
+      else
+        SourceNotebook.PageIndex := 1;
+      //StringResultEdit.Enabled := false;
+      //StringResultEdit.Color := clBtnFace;
+      //IfResultComboBox.Enabled := true;
+      //IfResultComboBox.Color := clWindow;
+      //CaseResultCheckGroup.Enabled := true;
+      //CaseOfEndElseRadioButton.Enabled := true;
+      //CaseOfEndRadioButton.Enabled := true;
     end;
-    else
-      StringResultEdit.Enabled := false;
-      StringResultEdit.Color := clBtnFace;
-      IfResultComboBox.Enabled := true;
-      IfResultComboBox.Color := clWindow;
-      CaseResultCheckGroup.Enabled := true;
-      CaseOfEndElseRadioButton.Enabled := true;
-      CaseOfEndRadioButton.Enabled := true;
   end;
 
 //ShowMessage(); ShowMessageFmt(); ShowMessagePos();
@@ -775,15 +773,10 @@ procedure TFormMessagesComposer.SetIfOrCaseExecute(Sender: TObject);
 begin
   if (KindMessageComboBox.ItemIndex = 12)or
      (KindMessageComboBox.ItemIndex = 13) then exit;
-  if (Sender=IfThenRadioButton)or(Sender=IfThenElseRadioButton) then begin
-    IfResultComboBox.Color := clWindow;
-    IfResultComboBox.Enabled := true;
-    CaseResultCheckGroup.Enabled := false;
-  end else begin
-    IfResultComboBox.Color := clBtnFace;
-    IfResultComboBox.Enabled := false;
-    CaseResultCheckGroup.Enabled := true;
-  end;
+  if IfThenRadioButton.Checked or IfThenElseRadioButton.Checked then
+    SourceNotebook.PageIndex := 0
+  else
+    SourceNotebook.PageIndex := 1;
 end;
 
 procedure TFormMessagesComposer.TestExecute(Sender: TObject);