diff --git a/components/tvplanit/source/vptaskeditdlg.lfm b/components/tvplanit/source/vptaskeditdlg.lfm
index 10d3fdef5..bf5126765 100644
--- a/components/tvplanit/source/vptaskeditdlg.lfm
+++ b/components/tvplanit/source/vptaskeditdlg.lfm
@@ -1,29 +1,31 @@
 object TaskEditForm: TTaskEditForm
-  Left = 468
+  Left = 243
   Height = 340
-  Top = 333
-  Width = 546
+  Top = 283
+  Width = 547
   HorzScrollBar.Page = 545
   VertScrollBar.Page = 339
   Caption = 'TaskEditForm'
   ClientHeight = 340
-  ClientWidth = 546
+  ClientWidth = 547
   Constraints.MinHeight = 340
   Constraints.MinWidth = 545
   Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  Font.Name = 'Default'
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
+  LCLVersion = '1.7'
   object Panel2: TPanel
+    Left = 0
     Height = 37
     Top = 303
-    Width = 546
+    Width = 547
     Align = alBottom
     BevelOuter = bvNone
     ClientHeight = 37
-    ClientWidth = 546
-    TabOrder = 0
+    ClientWidth = 547
+    TabOrder = 1
     object ResourceNameLbl: TLabel
       Left = 6
       Height = 16
@@ -37,9 +39,10 @@ object TaskEditForm: TTaskEditForm
       Font.Name = 'Tahoma'
       Font.Style = [fsBold]
       ParentColor = False
+      ParentFont = False
     end
     object OKBtn: TButton
-      Left = 387
+      Left = 388
       Height = 25
       Top = 6
       Width = 75
@@ -50,7 +53,7 @@ object TaskEditForm: TTaskEditForm
       TabOrder = 0
     end
     object CancelBtn: TButton
-      Left = 465
+      Left = 466
       Height = 25
       Top = 6
       Width = 75
@@ -62,30 +65,33 @@ object TaskEditForm: TTaskEditForm
     end
   end
   object PageControl1: TPageControl
+    Left = 0
     Height = 303
-    Width = 546
+    Top = 0
+    Width = 547
     TabStop = False
     ActivePage = tabTask
     Align = alClient
     TabIndex = 0
-    TabOrder = 1
+    TabOrder = 0
     object tabTask: TTabSheet
       Caption = 'Task'
-      ClientHeight = 277
-      ClientWidth = 538
+      ClientHeight = 276
+      ClientWidth = 539
       object DueDateLbl: TLabel
         Left = 52
         Height = 14
         Top = 44
-        Width = 49
+        Width = 46
         Caption = 'Due date:'
+        FocusControl = DueDateEdit
         ParentColor = False
       end
       object CreatedOnLbl: TLabel
         Left = 52
         Height = 14
         Top = 69
-        Width = 59
+        Width = 56
         Caption = 'Created on:'
         ParentColor = False
       end
@@ -93,7 +99,7 @@ object TaskEditForm: TTaskEditForm
         Left = 313
         Height = 14
         Top = 69
-        Width = 71
+        Width = 68
         Caption = 'Completed on:'
         ParentColor = False
       end
@@ -101,15 +107,17 @@ object TaskEditForm: TTaskEditForm
         Left = 4
         Height = 2
         Top = 32
-        Width = 523
+        Width = 529
         Anchors = [akTop, akLeft, akRight]
+        Shape = bsTopLine
       end
       object Bevel2: TBevel
         Left = 4
         Height = 2
         Top = 88
-        Width = 523
+        Width = 529
         Anchors = [akTop, akLeft, akRight]
+        Shape = bsBottomLine
       end
       object imgCalendar: TImage
         Left = 8
@@ -218,7 +226,7 @@ object TaskEditForm: TTaskEditForm
           D4C8D0D4C8D0D4C8D0D4C8D0D4C8D0D4C8D0D4C8D0D4C8D0D4C8D0D4C8D0D4C8
           D0D4
         }
-        Transparent = False
+        Transparent = True
       end
       object imgCompleted: TImage
         Left = 272
@@ -249,13 +257,13 @@ object TaskEditForm: TTaskEditForm
           3333333333333333333333333333330033333333333333333333333333333333
           3333
         }
-        Transparent = False
+        Transparent = True
       end
       object DescriptionEdit: TEdit
         Left = 4
-        Height = 21
+        Height = 22
         Top = 5
-        Width = 523
+        Width = 529
         Anchors = [akTop, akLeft, akRight]
         MaxLength = 255
         OnChange = OnChange
@@ -266,15 +274,15 @@ object TaskEditForm: TTaskEditForm
         Left = 313
         Height = 19
         Top = 41
-        Width = 70
+        Width = 64
         Caption = 'Complete'
         TabOrder = 2
       end
       object DetailsMemo: TMemo
         Left = 4
-        Height = 148
+        Height = 147
         Top = 96
-        Width = 523
+        Width = 529
         Anchors = [akTop, akLeft, akRight, akBottom]
         Lines.Strings = (
           'DetailsMemo'
@@ -282,7 +290,22 @@ object TaskEditForm: TTaskEditForm
         MaxLength = 1024
         OnChange = OnChange
         ScrollBars = ssVertical
+        TabOrder = 3
+      end
+      object DueDateEdit: TDateEdit
+        Left = 126
+        Height = 22
+        Top = 41
+        Width = 103
+        CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+        OKCaption = 'OK'
+        CancelCaption = 'Cancel'
+        DateOrder = doNone
+        ButtonWidth = 23
+        NumGlyphs = 1
+        MaxLength = 0
         TabOrder = 1
+        Text = 'DueDateEdit'
       end
     end
   end
diff --git a/components/tvplanit/source/vptaskeditdlg.pas b/components/tvplanit/source/vptaskeditdlg.pas
index 67ee7d813..5efaa3907 100644
--- a/components/tvplanit/source/vptaskeditdlg.pas
+++ b/components/tvplanit/source/vptaskeditdlg.pas
@@ -42,12 +42,14 @@ uses
   Messages, SysUtils,
   {$IFDEF VERSION6} Variants, {$ENDIF}
   Classes, Graphics, Controls, Forms, Dialogs, VpData, StdCtrls, ExtCtrls,
-  VpEdPop, VpDateEdit, VpBase, VpSR, VpDlg, ComCtrls;
+  VpEdPop, VpDateEdit, VpBase, VpSR, VpDlg, ComCtrls, EditBtn;
 
 type
   { forward declarations }
   TVpTaskEditDialog = class;
 
+  { TTaskEditForm }
+
   TTaskEditForm = class(TForm)
     Panel2: TPanel;
     OKBtn: TButton;
@@ -56,7 +58,7 @@ type
     tabTask: TTabSheet;
     DescriptionEdit: TEdit;
     DueDateLbl: TLabel;
-    DueDateEdit: TVpDateEdit;
+    DueDateEdit: TDateEdit;
     CompleteCB: TCheckBox;
     CreatedOnLbl: TLabel;
     CompletedOnLbl: TLabel;