diff --git a/components/tvplanit/source/vpevnteditdlg.lfm b/components/tvplanit/source/vpevnteditdlg.lfm
index 8cedc1d33..bf2c11154 100644
--- a/components/tvplanit/source/vpevnteditdlg.lfm
+++ b/components/tvplanit/source/vpevnteditdlg.lfm
@@ -124,7 +124,7 @@ object DlgEventEdit: TDlgEventEdit
       ParentColor = False
     end
     object Image2: TImage
-      Left = 352
+      Left = 368
       Height = 18
       Top = 81
       Width = 18
@@ -153,7 +153,7 @@ object DlgEventEdit: TDlgEventEdit
       }
     end
     object RecurringLbl: TLabel
-      Left = 379
+      Left = 395
       Height = 13
       Top = 87
       Width = 187
@@ -162,7 +162,7 @@ object DlgEventEdit: TDlgEventEdit
       ParentColor = False
     end
     object Bevel3: TBevel
-      Left = 339
+      Left = 350
       Height = 76
       Top = 78
       Width = 2
@@ -261,10 +261,10 @@ object DlgEventEdit: TDlgEventEdit
       }
     end
     object RecurrenceEndsLbl: TLabel
-      Left = 352
+      Left = 368
       Height = 13
       Top = 135
-      Width = 80
+      Width = 88
       Alignment = taRightJustify
       AutoSize = False
       Caption = 'Until:'
@@ -286,27 +286,7 @@ object DlgEventEdit: TDlgEventEdit
       Width = 74
       Caption = '&Reminder:'
       OnClick = AlarmSetClick
-      TabOrder = 12
-    end
-    object StartTime: TComboBox
-      Left = 231
-      Height = 23
-      Top = 104
-      Width = 93
-      ItemHeight = 15
-      OnChangeBounds = StartTimeChange
-      OnExit = StartTimeExit
-      TabOrder = 5
-    end
-    object EndTime: TComboBox
-      Left = 231
-      Height = 23
-      Top = 131
-      Width = 93
-      ItemHeight = 15
-      OnChangeBounds = EndTimeChange
-      OnExit = EndTimeExit
-      TabOrder = 7
+      TabOrder = 10
     end
     object Category: TComboBox
       Left = 484
@@ -320,14 +300,14 @@ object DlgEventEdit: TDlgEventEdit
       TabOrder = 2
     end
     object RecurringType: TComboBox
-      Left = 379
+      Left = 395
       Height = 23
       Top = 104
-      Width = 187
+      Width = 171
       ItemHeight = 15
       OnChange = RecurringTypeChange
       Style = csDropDownList
-      TabOrder = 8
+      TabOrder = 6
     end
     object IntervalUpDown: TUpDown
       Left = 652
@@ -339,7 +319,7 @@ object DlgEventEdit: TDlgEventEdit
       Min = 0
       OnClick = IntervalUpDownClick
       Position = 0
-      TabOrder = 10
+      TabOrder = 8
       Wrap = False
     end
     object AlarmAdvanceType: TComboBox
@@ -349,7 +329,7 @@ object DlgEventEdit: TDlgEventEdit
       Width = 93
       ItemHeight = 15
       Style = csDropDownList
-      TabOrder = 15
+      TabOrder = 13
     end
     object AdvanceUpDown: TUpDown
       Left = 194
@@ -361,11 +341,11 @@ object DlgEventEdit: TDlgEventEdit
       Min = 1
       OnClick = AdvanceUpDownClick
       Position = 1
-      TabOrder = 14
+      TabOrder = 12
       Wrap = False
     end
     object CBAllDay: TCheckBox
-      Left = 104
+      Left = 86
       Height = 19
       Top = 80
       Width = 89
@@ -378,7 +358,7 @@ object DlgEventEdit: TDlgEventEdit
       Height = 23
       Top = 104
       Width = 65
-      TabOrder = 9
+      TabOrder = 7
       Text = 'Placeholder control'
       Visible = False
     end
@@ -482,10 +462,10 @@ object DlgEventEdit: TDlgEventEdit
       NumGlyphs = 1
       MaxLength = 0
       OnChangeBounds = EndDateChange
-      TabOrder = 6
+      TabOrder = 5
     end
     object RepeatUntil: TDateEdit
-      Left = 440
+      Left = 464
       Height = 23
       Top = 131
       Width = 100
@@ -532,7 +512,7 @@ object DlgEventEdit: TDlgEventEdit
       }
       NumGlyphs = 1
       MaxLength = 0
-      TabOrder = 11
+      TabOrder = 9
     end
     object AlarmAdvance: TEdit
       Left = 130
@@ -540,7 +520,7 @@ object DlgEventEdit: TDlgEventEdit
       Top = 168
       Width = 64
       OnChange = AlarmAdvanceChange
-      TabOrder = 13
+      TabOrder = 11
       Text = 'AlarmAdvance'
     end
     object LocationLbl: TLabel
diff --git a/components/tvplanit/source/vpevnteditdlg.pas b/components/tvplanit/source/vpevnteditdlg.pas
index 3cd16cb7b..efc891f0f 100644
--- a/components/tvplanit/source/vpevnteditdlg.pas
+++ b/components/tvplanit/source/vpevnteditdlg.pas
@@ -35,14 +35,13 @@ interface
 
 uses
   {$IFDEF LCL}
-  LMessages, LCLProc, LCLType, LCLIntf, LResources,
+  LMessages, LCLProc, LCLType, LCLIntf, LResources, EditBtn,
   {$ELSE}
   Windows, Messages, Mask,
   {$ENDIF}
   SysUtils, {$IFDEF VERSION6}Variants,{$ENDIF} Classes,
-  Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, VpData, VpEdPop,
-  ComCtrls, VpBase, VpBaseDS, VpDlg, VpConst,
-  Buttons, EditBtn;
+  Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, Buttons,
+  VpData, VpBase, VpBaseDS, VpDlg, VpConst; //VpEdPop,
 
 type
   { forward declarations }
@@ -87,8 +86,6 @@ type
     SpeedButton1: TSpeedButton;
     DescriptionEdit: TEdit;
     AlarmSet: TCheckBox;
-    StartTime: TComboBox;
-    EndTime: TComboBox;
     Category: TComboBox;
     RecurringType: TComboBox;
     IntervalUpDown: TUpDown;
@@ -119,6 +116,14 @@ type
     procedure StartTimeExit(Sender: TObject);
     procedure EndTimeExit(Sender: TObject);
   private { Private declarations }
+   {$IFDEF LCL}
+    StartTime: TTimeEdit;
+    EndTime: TTimeEdit;
+   {$ENDIF}
+   {$IFDEF DELPHI}
+    StartTime: TComboBox;
+    EndTime: TComboBox;
+   {$ENDIF}
     AAVerifying: Boolean;
     CIVerifying: Boolean;
     FCustomInterval : TVpRightAlignedEdit;
@@ -184,11 +189,31 @@ end;
 
 procedure TDlgEventEdit.FormCreate(Sender: TObject);
 begin
+ {$IFDEF LCL}
+  StartTime := TTimeEdit.Create(self);
+ {$ELSE}
+  StartTime := TCombobox.Create(self);
+  StartTime.Width := 93;
+  StartTime.ItemIndex := -1;
+ {$ENDIF}
+  StartTime.Parent := AppointmentGroupbox;
+  StartTime.Left := AlarmAdvanceType.Left;
+  StartTime.Top := StartDate.Top;
+
+ {$IFDEF LCL}
+  EndTime := TTimeEdit.Create(self);
+ {$ELSE}
+  EndTime := TCombobox.Create(self);
+  EndTime.Width := 93;
+  EndTime.ItemIndex := -1;
+ {$ENDIF}
+  EndTime.Parent := AppointmentGroupbox;
+  EndTime.Left := AlarmAdvanceType.Left;
+  EndTime.Top := EndDate.Top;
+
   ReturnCode := rtAbandon;
   PopLists;
   LoadCaptions;
-  StartTime.ItemIndex := -1;
-  EndTime.ItemIndex := -1;
   EndDate.Enabled := False;
 
   FCustomInterval := TVpRightAlignedEdit.Create(Self);
@@ -449,6 +474,7 @@ var
   I, Hour, Minute: Integer;
   MinStr, AMPMStr: string;
 begin
+ {$IFDEF DELPHI}
  { Time Lists }
   StringList := TStringList.Create;
   try
@@ -479,6 +505,7 @@ begin
   finally
     StringList.Free;
   end;
+ {$ENDIF}
 
   { RecurringList }
   RecurringType.Items.Add(RSNone);