diff --git a/components/tvplanit/source/vpalarmdlg.lfm b/components/tvplanit/source/vpalarmdlg.lfm
index a67c8a3a2..39c4423c5 100644
--- a/components/tvplanit/source/vpalarmdlg.lfm
+++ b/components/tvplanit/source/vpalarmdlg.lfm
@@ -1,13 +1,15 @@
 object AlarmNotifyForm: TAlarmNotifyForm
-  Left = 322
-  Height = 210
-  Top = 254
-  Width = 410
-  HorzScrollBar.Page = 409
-  VertScrollBar.Page = 209
+  Left = 522
+  Height = 208
+  Top = 352
+  Width = 408
+  HorzScrollBar.Page = 407
+  VertScrollBar.Page = 207
+  BorderIcons = [biSystemMenu]
+  BorderStyle = bsDialog
   Caption = 'Reminder'
-  ClientHeight = 210
-  ClientWidth = 410
+  ClientHeight = 208
+  ClientWidth = 408
   Color = clInfoBk
   KeyPreview = True
   OnKeyDown = FormKeyDown
diff --git a/components/tvplanit/source/vpalarmdlg.lrs b/components/tvplanit/source/vpalarmdlg.lrs
index 8ceece693..9f86707f8 100644
--- a/components/tvplanit/source/vpalarmdlg.lrs
+++ b/components/tvplanit/source/vpalarmdlg.lrs
@@ -1,40 +1,40 @@
 { Das ist eine automatisch erzeugte Lazarus-Ressourcendatei }
 
 LazarusResources.Add('TAlarmNotifyForm','FORMDATA',[
-  'TPF0'#16'TAlarmNotifyForm'#15'AlarmNotifyForm'#4'Left'#3'B'#1#6'Height'#3#210
-  +#0#3'Top'#3#254#0#5'Width'#3#154#1#18'HorzScrollBar.Page'#3#153#1#18'VertScr'
-  +'ollBar.Page'#3#209#0#7'Caption'#6#8'Reminder'#12'ClientHeight'#3#210#0#11'C'
-  +'lientWidth'#3#154#1#5'Color'#7#8'clInfoBk'#10'KeyPreview'#9#9'OnKeyDown'#7
-  +#11'FormKeyDown'#6'OnShow'#7#8'FormShow'#8'Position'#7#9'poDefault'#0#6'TBev'
-  +'el'#6'Bevel1'#4'Left'#3'8'#1#6'Height'#3#161#0#3'Top'#2#8#5'Width'#2'Y'#0#0
-  +#6'TBevel'#6'Bevel2'#4'Left'#2#4#6'Height'#2'&'#3'Top'#3#168#0#5'Width'#3#141
-  +#1#0#0#6'TLabel'#14'SubjectCaption'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#3#5
-  +'Width'#2'J'#7'Caption'#6#14'SubjectCaption'#11'ParentColor'#8#0#0#6'TLabel'
-  +#12'NotesCaption'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'0'#5'Width'#2'B'#7'Cap'
-  +'tion'#6#12'NotesCaption'#11'ParentColor'#8#0#0#6'TLabel'#13'SnoozeCaption'#4
-  +'Left'#2#10#6'Height'#2#13#3'Top'#3#181#0#5'Width'#3#20#1#9'Alignment'#7#14
-  +'taRightJustify'#8'AutoSize'#8#7'Caption'#6#13'SnoozeCaption'#11'ParentColor'
-  +#8#0#0#7'TButton'#10'DismissBtn'#4'Left'#3'@'#1#6'Height'#2#25#3'Top'#2#16#5
-  +'Width'#2'K'#7'Caption'#6#10'DismissBtn'#7'OnClick'#7#15'DismissBtnClick'#8
-  +'TabOrder'#2#0#0#0#7'TButton'#9'SnoozeBtn'#4'Left'#3'@'#1#6'Height'#2#25#3'T'
-  +'op'#2'0'#5'Width'#2'K'#7'Caption'#6#9'SnoozeBtn'#7'OnClick'#7#14'SnoozeBtnC'
-  +'lick'#8'TabOrder'#2#1#0#0#7'TButton'#11'OpenItemBtn'#4'Left'#3'@'#1#6'Heigh'
-  +'t'#2#25#3'Top'#2'`'#5'Width'#2'K'#7'Caption'#6#11'OpenItemBtn'#7'Default'#9
-  +#7'OnClick'#7#16'OpenItemBtnClick'#8'TabOrder'#2#2#0#0#5'TEdit'#11'SubjectEd'
-  +'it'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#19#5'Width'#3')'#1#8'ReadOnly'#9#8
-  +'TabOrder'#2#3#0#0#5'TMemo'#9'NotesMemo'#4'Left'#2#8#6'Height'#2'a'#3'Top'#2
-  +'@'#5'Width'#3')'#1#13'Lines.Strings'#1#6#1'1'#6#1'2'#6#1'3'#6#1'4'#6#1'5'#6
-  +#1'6'#0#8'ReadOnly'#9#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#4#0#0#9
-  +'TComboBox'#11'SnoozeCombo'#4'Left'#3'"'#1#6'Height'#2#21#3'Top'#3#178#0#5'W'
-  +'idth'#2'j'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearc'
-  +'hAscending'#0#10'ItemHeight'#2#13#13'Items.Strings'#1#6#9'5 Minutes'#6#10'1'
-  +'0 Minutes'#6#10'15 Minutes'#6#10'30 Minutes'#6#10'45 Minutes'#6#7'1 Hours'#6
-  +#7'2 Hours'#6#7'3 Hours'#6#7'4 Hours'#6#7'5 Hours'#6#7'6 Hours'#6#7'7 Hours'
-  +#6#7'8 Hours'#6#6'1 Days'#6#6'2 Days'#6#6'3 Days'#6#6'4 Days'#6#6'5 Days'#6#6
-  +'6 Days'#6#6'1 Week'#0#8'OnChange'#7#17'SnoozeComboChange'#11'ParentColor'#9
-  +#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#5#0#0#18'TVpEventEditDialog'#11
-  +'EventDialog'#7'Version'#6#5'v1.03'#10'TimeFormat'#7#8'tf24Hour'#18'Placemen'
-  +'t.Position'#7#11'mpCenterTop'#13'Placement.Top'#2#10#14'Placement.Left'#2#10
-  +#16'Placement.Height'#3#156#1#15'Placement.Width'#3#193#2#4'left'#3','#1#3't'
-  +'op'#2'$'#0#0#0
+  'TPF0'#16'TAlarmNotifyForm'#15'AlarmNotifyForm'#4'Left'#3#10#2#6'Height'#3#208
+  +#0#3'Top'#3'`'#1#5'Width'#3#152#1#18'HorzScrollBar.Page'#3#151#1#18'VertScro'
+  +'llBar.Page'#3#207#0#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7
+  +#8'bsDialog'#7'Caption'#6#8'Reminder'#12'ClientHeight'#3#208#0#11'ClientWidt'
+  +'h'#3#152#1#5'Color'#7#8'clInfoBk'#10'KeyPreview'#9#9'OnKeyDown'#7#11'FormKe'
+  +'yDown'#6'OnShow'#7#8'FormShow'#8'Position'#7#9'poDefault'#0#6'TBevel'#6'Bev'
+  +'el1'#4'Left'#3'8'#1#6'Height'#3#161#0#3'Top'#2#8#5'Width'#2'Y'#0#0#6'TBevel'
+  +#6'Bevel2'#4'Left'#2#4#6'Height'#2'&'#3'Top'#3#168#0#5'Width'#3#141#1#0#0#6
+  +'TLabel'#14'SubjectCaption'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#3#5'Width'#2
+  +'J'#7'Caption'#6#14'SubjectCaption'#11'ParentColor'#8#0#0#6'TLabel'#12'Notes'
+  +'Caption'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'0'#5'Width'#2'B'#7'Caption'#6
+  +#12'NotesCaption'#11'ParentColor'#8#0#0#6'TLabel'#13'SnoozeCaption'#4'Left'#2
+  +#10#6'Height'#2#13#3'Top'#3#181#0#5'Width'#3#20#1#9'Alignment'#7#14'taRightJ'
+  +'ustify'#8'AutoSize'#8#7'Caption'#6#13'SnoozeCaption'#11'ParentColor'#8#0#0#7
+  +'TButton'#10'DismissBtn'#4'Left'#3'@'#1#6'Height'#2#25#3'Top'#2#16#5'Width'#2
+  +'K'#7'Caption'#6#10'DismissBtn'#7'OnClick'#7#15'DismissBtnClick'#8'TabOrder'
+  +#2#0#0#0#7'TButton'#9'SnoozeBtn'#4'Left'#3'@'#1#6'Height'#2#25#3'Top'#2'0'#5
+  +'Width'#2'K'#7'Caption'#6#9'SnoozeBtn'#7'OnClick'#7#14'SnoozeBtnClick'#8'Tab'
+  +'Order'#2#1#0#0#7'TButton'#11'OpenItemBtn'#4'Left'#3'@'#1#6'Height'#2#25#3'T'
+  +'op'#2'`'#5'Width'#2'K'#7'Caption'#6#11'OpenItemBtn'#7'Default'#9#7'OnClick'
+  +#7#16'OpenItemBtnClick'#8'TabOrder'#2#2#0#0#5'TEdit'#11'SubjectEdit'#4'Left'
+  +#2#8#6'Height'#2#21#3'Top'#2#19#5'Width'#3')'#1#8'ReadOnly'#9#8'TabOrder'#2#3
+  +#0#0#5'TMemo'#9'NotesMemo'#4'Left'#2#8#6'Height'#2'a'#3'Top'#2'@'#5'Width'#3
+  +')'#1#13'Lines.Strings'#1#6#1'1'#6#1'2'#6#1'3'#6#1'4'#6#1'5'#6#1'6'#0#8'Read'
+  +'Only'#9#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#4#0#0#9'TComboBox'#11
+  +'SnoozeCombo'#4'Left'#3'"'#1#6'Height'#2#21#3'Top'#3#178#0#5'Width'#2'j'#16
+  +'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0
+  +#10'ItemHeight'#2#13#13'Items.Strings'#1#6#9'5 Minutes'#6#10'10 Minutes'#6#10
+  +'15 Minutes'#6#10'30 Minutes'#6#10'45 Minutes'#6#7'1 Hours'#6#7'2 Hours'#6#7
+  +'3 Hours'#6#7'4 Hours'#6#7'5 Hours'#6#7'6 Hours'#6#7'7 Hours'#6#7'8 Hours'#6
+  +#6'1 Days'#6#6'2 Days'#6#6'3 Days'#6#6'4 Days'#6#6'5 Days'#6#6'6 Days'#6#6'1'
+  +' Week'#0#8'OnChange'#7#17'SnoozeComboChange'#11'ParentColor'#9#5'Style'#7#14
+  +'csDropDownList'#8'TabOrder'#2#5#0#0#18'TVpEventEditDialog'#11'EventDialog'#7
+  +'Version'#6#5'v1.03'#10'TimeFormat'#7#8'tf24Hour'#18'Placement.Position'#7#11
+  +'mpCenterTop'#13'Placement.Top'#2#10#14'Placement.Left'#2#10#16'Placement.He'
+  +'ight'#3#156#1#15'Placement.Width'#3#193#2#4'left'#3','#1#3'top'#2'$'#0#0#0
 ]);
diff --git a/components/tvplanit/source/vpalarmdlg.pas b/components/tvplanit/source/vpalarmdlg.pas
index e960ac342..63ed9f4e8 100644
--- a/components/tvplanit/source/vpalarmdlg.pas
+++ b/components/tvplanit/source/vpalarmdlg.pas
@@ -125,13 +125,11 @@ begin
     try
       try
         Event.AlertDisplayed := true;
-//        DoFormPlacement(AlarmNotifyForm);
+        DoFormPlacement(AlarmNotifyForm);
         AlarmNotifyForm.Color := BackgroundColor;
         AlarmNotifyForm.DataStore := DataStore;
         AlarmNotifyForm.Event := Event;
         AlarmNotifyForm.PopulateSelf;
-        AlarmNotifyForm.Width := 410;
-        AlarmNotifyForm.Height := 210;
         AlarmNotifyForm.ShowModal;
       finally
         Event.AlertDisplayed := false;
@@ -264,6 +262,8 @@ end;
 {=====}
 procedure TAlarmNotifyForm.FormShow(Sender: TObject);
 begin
+  Self.Width := 410;
+  Self.Height := 210;
   OpenItemBtn.SetFocus;
 end;
 
diff --git a/components/tvplanit/source/vpcanvasutils.pas b/components/tvplanit/source/vpcanvasutils.pas
index 6ad395688..059273893 100644
--- a/components/tvplanit/source/vpcanvasutils.pas
+++ b/components/tvplanit/source/vpcanvasutils.pas
@@ -84,7 +84,8 @@ interface
 uses
   {$IFDEF LCL}
   LMessages,LCLProc,LCLType,LCLIntf,
-  {$ELSE}
+  {$ENDIF}
+  {$IFDEF WINDOWS}
   Windows,
   {$ENDIF}
   Classes,
@@ -109,7 +110,7 @@ type
 
     protected                                                            
       procedure DrawRotatedText (x, y   : Integer;
-                                 Text   : string;
+                                 Text   : Widestring;
                                  Rotate : Boolean);
       procedure Swap (var a, b : Integer);
 
@@ -977,7 +978,7 @@ begin
 end;
 
 procedure TVpExCanvas.DrawRotatedText (x, y   : Integer;
-                                       Text   : string;
+                                       Text   : Widestring;
                                        Rotate : Boolean);
 
 var
@@ -985,7 +986,6 @@ var
   OldFont       : TFont;
   RealPoint     : TPoint;
   OldBrushStyle : TBrushStyle;
-
 begin
   if not Assigned (FCanvas) then
     raise EVpCanvasError.Create (RSNoCanvas);
@@ -1035,7 +1035,7 @@ begin
     OldBrushStyle := FCanvas.Brush.Style;       
     try
       FCanvas.Brush.Style := bsClear;
-      FCanvas.TextOut (RealPoint.X, RealPoint.Y, Text);
+      FCanvas.TextOut(RealPoint.X,RealPoint.Y,Text);
     finally
       FCanvas.Brush.Style := OldBrushStyle;
     end;
@@ -1044,6 +1044,26 @@ begin
   end;
 end;
 
+procedure DrawTextW(Canvas: TCanvas; lpString: PWideChar; var lpRect: TRect; uFormat: Cardinal;
+  AdjustRight: Boolean);
+var Style:TTextStyle;
+begin
+  {$ifndef WINCE}
+    {$ifdef UNIX}
+      {$ifdef LCLgtk}
+        Style.Layout:=tlCenter;
+        Canvas.TextRect(lpRect,lpRect.Left,lpRect.Top,lpString,Style); // theo 24.2.2007 Gibt sonst Striche auf GTK1
+      {$else}
+        DrawTextW(Canvas.Handle, lpString, Length(lpString), lpRect, uFormat, AdjustRight);
+      {$endif}
+    {$else}
+    Canvas.TextOut(lpRect.Left,lpRect.Top,lpString);
+    {$endif}
+  {$else}
+  Canvas.TextOut(lpRect.Left,lpRect.Top,lpString);
+  {$endif}
+end;
+
 function TVpExCanvas.ViewportWidth : Integer;
 var
   FixRect : TRect;
diff --git a/components/tvplanit/source/vpdayview.pas b/components/tvplanit/source/vpdayview.pas
index 64464e3b4..36d237692 100644
--- a/components/tvplanit/source/vpdayview.pas
+++ b/components/tvplanit/source/vpdayview.pas
@@ -1305,13 +1305,12 @@ end;
 {=====}
 
 procedure TVpDayView.DoStartDrag(var DragObject: TDragObject);
-begin
+begin exit;
   DvDragStartTime := 0.0;
-
   if ReadOnly then
     Exit;
   if FActiveEvent <> nil then begin
-    { Set the time from which this event was dragged }
+    // Set the time from which this event was dragged
     DvDragStartTime := trunc(Date + ActiveCol)
       + dvLineMatrix[ActiveCol, ActiveRow].Time;
 
@@ -1324,7 +1323,7 @@ end;
 {=====}
 
 procedure TVpDayView.DoEndDrag(Target: TObject; X, Y: Integer);
-begin
+begin exit;
   if ReadOnly then
     Exit;
   TVpEventDragObject(Target).Free;
@@ -1333,7 +1332,7 @@ end;
 
 procedure TVpDayView.DragOver(Source: TObject; X, Y: Integer; State: TDragState;
   var Accept: Boolean);
-begin
+begin exit;
   if ReadOnly then begin
     Accept := False;
     Exit;
@@ -1355,7 +1354,7 @@ var
   DragToTime  : TDateTime;
   i           : Integer;                                                 
 
-begin
+begin exit;
   if ReadOnly then
     Exit;
   Event := TVpEventDragObject(Source).Event;
diff --git a/components/tvplanit/source/vpdlg.pas b/components/tvplanit/source/vpdlg.pas
index 2f2daa7ca..3e15f534f 100644
--- a/components/tvplanit/source/vpdlg.pas
+++ b/components/tvplanit/source/vpdlg.pas
@@ -180,12 +180,12 @@ begin
   else
     Form.BorderStyle:= bsDialog;
 
-  if (Screen.ActiveForm <> nil)
-  and(Screen.ActiveForm.FormStyle = fsStayOnTop) then
+  if  (Screen.ActiveForm <> nil)
+  and (Screen.ActiveForm.FormStyle = fsStayOnTop) then
     Form.FormStyle := fsStayOnTop;
 
-  Form.Height := FPlacement.Height;
-  Form.Width  := FPlacement.Width;
+//  Form.Height := FPlacement.Height;
+//  Form.Width  := FPlacement.Width;
 
   {set position}
   case FPlacement.Position of