diff --git a/components/tvplanit/languages/demo.de.po b/components/tvplanit/languages/demo.de.po
index 4ff365900..ee615fda7 100644
--- a/components/tvplanit/languages/demo.de.po
+++ b/components/tvplanit/languages/demo.de.po
@@ -147,7 +147,7 @@ msgstr "Turbo Power VisualPlanIt Demo"
 
 #: tmainform.cballowinplaceediting.caption
 msgid "Allow inplace editing"
-msgstr ""
+msgstr "Editieren an Ort und Stelle erlauben"
 
 #: tmainform.cbgranularity.text
 msgid "30 Min"
@@ -241,4 +241,3 @@ msgstr "Aufgaben"
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr ""
-
diff --git a/components/tvplanit/packages/laz_visualplanit.lpk b/components/tvplanit/packages/laz_visualplanit.lpk
index 90954a9b0..56b36f8fb 100644
--- a/components/tvplanit/packages/laz_visualplanit.lpk
+++ b/components/tvplanit/packages/laz_visualplanit.lpk
@@ -32,7 +32,7 @@ Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower S
 
 Contributor(s): "/>
     <Version Major="1" Release="4"/>
-    <Files Count="69">
+    <Files Count="70">
       <Item1>
         <Filename Value="../source/vpalarmdlg.lfm"/>
         <Type Value="LFM"/>
@@ -310,6 +310,10 @@ Contributor(s): "/>
         <Filename Value="../source/vpcontactgridpainter.pas"/>
         <UnitName Value="VpContactGridPainter"/>
       </Item69>
+      <Item70>
+        <Filename Value="../source/vptasklistpainter.pas"/>
+        <UnitName Value="VpTasklistPainter"/>
+      </Item70>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/tvplanit/source/vpbasepainter.pas b/components/tvplanit/source/vpbasepainter.pas
index ffd5d1b3b..36a0d4b16 100644
--- a/components/tvplanit/source/vpbasepainter.pas
+++ b/components/tvplanit/source/vpbasepainter.pas
@@ -3,7 +3,7 @@ unit VpBasePainter;
 interface
 
 uses
-  Classes, Graphics,
+  Classes, Graphics, LCLType,
   VPBase;
 
 type
@@ -23,6 +23,8 @@ type
     UseGran: TVpGranularity;
     DisplayOnly: Boolean;
   protected
+    // Shared local variables of all the old painting routines
+    Rgn: HRGN;
     RealWidth: Integer;
     RealHeight: Integer;
     RealLeft: Integer;
diff --git a/components/tvplanit/source/vpcontactgridpainter.pas b/components/tvplanit/source/vpcontactgridpainter.pas
index 5d5bcbe88..cfa49e821 100644
--- a/components/tvplanit/source/vpcontactgridpainter.pas
+++ b/components/tvplanit/source/vpcontactgridpainter.pas
@@ -16,7 +16,6 @@ type
     PhoneLblWidth: Integer;
     StartContact: Integer;
     RealColumnWidth: Integer;
-    Rgn: HRGN;
     RealColor: TColor;
     SizingBarColor: TColor;
     BevelDarkShadow: TColor;
diff --git a/components/tvplanit/source/vpdayviewpainter.pas b/components/tvplanit/source/vpdayviewpainter.pas
index 4a9514bb1..bf4103e21 100644
--- a/components/tvplanit/source/vpdayviewpainter.pas
+++ b/components/tvplanit/source/vpdayviewpainter.pas
@@ -38,7 +38,6 @@ type
     EventCount: Integer;
     DayWidth: Integer;
     RealNumDays: Integer;
-    Rgn: HRGN;
     RealRowHeight: Integer;
     RealColHeadHeight: Integer;
     RealRowHeadWidth: Integer;
diff --git a/components/tvplanit/source/vptasklist.pas b/components/tvplanit/source/vptasklist.pas
index 28bc6d331..7bd6a93e6 100644
--- a/components/tvplanit/source/vptasklist.pas
+++ b/components/tvplanit/source/vptasklist.pas
@@ -281,7 +281,7 @@ type
 implementation
 
 uses
-  SysUtils, Math, Forms, Dialogs, VpTaskEditDlg, VpDlg;
+  SysUtils, Math, Forms, Dialogs, VpTaskEditDlg, VpDlg, VpTasklistPainter;
 
 
 (*****************************************************************************)
@@ -658,15 +658,23 @@ begin
 end;
 {=====}
 
-procedure TVpTaskList.RenderToCanvas (RenderCanvas : TCanvas;
-                                       RenderIn     : TRect;
-                                       Angle        : TVpRotationAngle;
-                                       Scale        : Extended;
-                                       RenderDate   : TDateTime;
-                                       StartLine    : Integer;
-                                       StopLine     : Integer;
-                                       UseGran      : TVpGranularity;
-                                       DisplayOnly  : Boolean);
+procedure TVpTaskList.RenderToCanvas(RenderCanvas: TCanvas; RenderIn: TRect;
+  Angle: TVpRotationAngle; Scale: Extended; RenderDate : TDateTime;
+  StartLine, StopLine: Integer; UseGran: TVpGranularity; DisplayOnly: Boolean);
+var
+  painter: TVpTaskListPainter;
+begin
+  tlPainting := true;
+  painter := TVpTaskListPainter.Create(Self, RenderCanvas);
+  try
+    painter.RenderToCanvas(RenderIn, Angle, Scale, RenderDate, StartLine,
+      StopLine, UseGran, DisplayOnly);
+  finally
+    painter.Free;
+    tlPainting := false;
+  end;
+end;
+(*
 var
   HeadRect       : TRect;
   Bmp            : Graphics.TBitmap;
@@ -1179,7 +1187,7 @@ begin
   RenderCanvas.Pen.Color := SavePenColor;
   tlPainting := false;
 end;
-{=====}
+{=====}                       *)
 
 procedure TVpTaskList.SetColor(const Value: TColor);
 begin
diff --git a/components/tvplanit/source/vpweekviewpainter.pas b/components/tvplanit/source/vpweekviewpainter.pas
index 8c827eaf0..fbe06071a 100644
--- a/components/tvplanit/source/vpweekviewpainter.pas
+++ b/components/tvplanit/source/vpweekviewpainter.pas
@@ -21,7 +21,6 @@ type
     StrLn: Integer;
     StartDate: TDateTime;
     ADEventsRect: TRect;
-    Rgn: HRGN;
     DotDotDotColor: TColor;
     BevelHighlightColor: TColor;
     BevelShadowColor: TColor;