diff --git a/components/tvplanit/source/vpcontactgridpainter.pas b/components/tvplanit/source/vpcontactgridpainter.pas
index 1444ee926..a645fcd74 100644
--- a/components/tvplanit/source/vpcontactgridpainter.pas
+++ b/components/tvplanit/source/vpcontactgridpainter.pas
@@ -104,20 +104,11 @@ procedure TVpContactGridPainter.DrawBorders;
 var
   R: TRect;
 begin
-  R := RenderIn;
-  dec(R.Right, 1);
-  dec(R.Bottom, 1);
+  R := TPSRotateRectangle(Angle, RenderIn, Rect(RealLeft, RealTop, RealRight - 1, RealBottom - 1));
   case FContactGrid.DrawingStyle of
-    dsFlat:
-      begin  { Draw a simple border rectangle }
-        DrawBevelRect(RenderCanvas, R, BevelShadow, BevelShadow);
-      end;
-    ds3d:
-      begin  { Draw a 3d bevel }
-        DrawBevelRect(RenderCanvas, R, BevelShadow, BevelHighlight);
-        InflateRect(R, -1, -1);
-        DrawBevelRect(RenderCanvas, R, BevelDarkShadow, BevelFace);
-      end;
+    dsNoBorder: ;
+    dsFlat: DrawBevelRect(RenderCanvas, R, BevelShadow, BevelShadow);
+    ds3D: DrawBevelRect(RenderCanvas, R, BevelShadow, BevelHighlight);
   end;
 end;