diff --git a/components/tvplanit/examples/demo/demomain.lfm b/components/tvplanit/examples/demo/demomain.lfm
index 68d5c7c95..e45259010 100644
--- a/components/tvplanit/examples/demo/demomain.lfm
+++ b/components/tvplanit/examples/demo/demomain.lfm
@@ -58,10 +58,7 @@ object MainForm: TMainForm
             KBNavigation = True
             DateLabelFormat = 'mmmm yyyy'
             DayHeadAttributes.Color = clBtnFace
-            DayHeadAttributes.Font.Height = -13
-            DayHeadAttributes.Font.Name = 'Tahoma'
             DayNameStyle = dsShort
-            DayNumberFont.Style = [fsBold]
             DrawingStyle = dsFlat
             EventDayStyle = [fsItalic]
             LineColor = clGray
diff --git a/components/tvplanit/source/vpcanvasutils.pas b/components/tvplanit/source/vpcanvasutils.pas
index 6802c5413..9bf6147ef 100644
--- a/components/tvplanit/source/vpcanvasutils.pas
+++ b/components/tvplanit/source/vpcanvasutils.pas
@@ -721,6 +721,7 @@ var
   OldFont: TFont;
   RealPoint: TPoint;
   OldBrushStyle: TBrushStyle;
+  savedFontHeight: Integer;
 begin
   if not Assigned(FCanvas) then
     raise EVpCanvasError.Create(RSNoCanvas);
@@ -758,6 +759,7 @@ begin
   // Create new font to use
   OldFont := FCanvas.Font;
   try
+    savedFontHeight := FCanvas.Font.Height;
     FCanvas.Font.Handle:= CreateFontIndirect(LF);
 
     // Output the text
@@ -774,6 +776,7 @@ begin
     end;
   finally
     FCanvas.Font := OldFont;
+    FCanvas.Font.Height := savedFontHeight;
   end;
 end;
 
diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas
index f246e0d15..9952d2b5c 100644
--- a/components/tvplanit/source/vpmonthview.pas
+++ b/components/tvplanit/source/vpmonthview.pas
@@ -349,9 +349,9 @@ begin
   mvVisibleEvents := 0;                                                  
 
   { set up fonts and colors }
-  FDayHeadAttributes.Font.Name := 'Tahoma';
-  FDayHeadAttributes.Font.Size := 10;
-  FDayHeadAttributes.Font.Style := [];
+//  FDayHeadAttributes.Font.Name := 'Tahoma';   wp: better use defaults
+//  FDayHeadAttributes.Font.Size := 10;
+//  FDayHeadAttributes.Font.Style := [];
   FDayHeadAttributes.Color := clBtnFace;
 
   { Assign default font to DayNumberFont and EventFont }