diff --git a/components/tvplanit/source/vpalarmdlg.lfm b/components/tvplanit/source/vpalarmdlg.lfm
index 39c4423c5..95c96ed07 100644
--- a/components/tvplanit/source/vpalarmdlg.lfm
+++ b/components/tvplanit/source/vpalarmdlg.lfm
@@ -1,62 +1,86 @@
 object AlarmNotifyForm: TAlarmNotifyForm
-  Left = 522
-  Height = 208
-  Top = 352
-  Width = 408
-  HorzScrollBar.Page = 407
-  VertScrollBar.Page = 207
+  Left = 266
+  Height = 205
+  Top = 174
+  Width = 407
+  HorzScrollBar.Page = 406
+  VertScrollBar.Page = 204
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Reminder'
-  ClientHeight = 208
-  ClientWidth = 408
-  Color = clInfoBk
+  ClientHeight = 205
+  ClientWidth = 407
+  Color = clWindow
   KeyPreview = True
   OnKeyDown = FormKeyDown
   OnShow = FormShow
   Position = poDefault
-  object Bevel1: TBevel
-    Left = 312
-    Height = 161
-    Top = 8
-    Width = 89
-  end
-  object Bevel2: TBevel
-    Left = 4
-    Height = 38
-    Top = 168
-    Width = 397
-  end
-  object SubjectCaption: TLabel
-    Left = 8
-    Height = 14
-    Top = 3
-    Width = 74
-    Caption = 'SubjectCaption'
-    ParentColor = False
-  end
-  object NotesCaption: TLabel
-    Left = 8
-    Height = 14
-    Top = 48
-    Width = 66
-    Caption = 'NotesCaption'
-    ParentColor = False
-  end
   object SnoozeCaption: TLabel
-    Left = 10
+    Left = 48
     Height = 13
-    Top = 181
-    Width = 276
+    Top = 136
+    Width = 78
     Alignment = taRightJustify
     AutoSize = False
     Caption = 'SnoozeCaption'
     ParentColor = False
   end
+  object lSubject: TLabel
+    Left = 48
+    Height = 14
+    Top = 8
+    Width = 47
+    Caption = 'lSubject'
+    Font.Style = [fsBold]
+    ParentColor = False
+  end
+  object lNotes: TLabel
+    Left = 48
+    Height = 96
+    Top = 32
+    Width = 344
+    AutoSize = False
+    Caption = 'lNotes'
+    ParentColor = False
+    WordWrap = True
+  end
+  object Image1: TImage
+    Left = 5
+    Height = 18
+    Top = 8
+    Width = 19
+    Picture.Data = {
+      1754506F727461626C654E6574776F726B47726170686963CE02000089504E47
+      0D0A1A0A0000000D49484452000000100000001008060000001FF3FF61000002
+      954944415478DA8593EF4B535118C79D0E7F202AFE405F280A09C359126EAFCA
+      5E0AF50F0441F5A277516FA3222D4C8D0A419A600582A6F8A2985E119D08DEB9
+      F6C3EEE64A436A53F7C3ADC5B4E9EE4ABBF3CED9BE9D73B75961D685EF7DEE39
+      CFF97ECEF31CCECD009041451E9952A96CD66834F30A85E21C19CBE95C4A7295
+      4A75A6AFAF8FA36BE8DC818FBEDC247044769D0EC16010B6890969EC4E897E2F
+      4C4F4BB977535307B9D4C619323A58CAC981C362412010C04712DF6765219C99
+      2969512683636E4ECAD1358B2940AABA2460353F1FCCE0207C3E1F9881012C94
+      95C15F52027F6121DEE6E581E9EF4FE64874FE0DB05954047D5D1D9E575581AD
+      A981A7BA1A6B9595F09697C34940BA8202F4E4E662323B1B4152D121C04E6929
+      BE34356143ADC67A43030204E6AFADC51A017908C85D510117A9CA5D5C8CB05C
+      FE27C066B3617F7FFF486DAF7308CCDF85B01DA20727CD51CF9100411060B7DB
+      C1F33CEC360B56D8EB08BBB4D8740E219148FC1F40CD63636388C7E3082DBF24
+      C661C4BFBBB13279093B2107445184D56A3D0CA0863484611808BC97982E43DC
+      9C8418EC06EFD1C1A36F25956D1D0D488B6146F189EBC2D6CA08C4403B4C8FD4
+      D80B8F60B1BF19CE37AFC071DCBF01D3231AACE95B100B0D21EABE02D3C346EC
+      FA6FE1AB770A0B2FCEC36EB5E0E02A530031FD489BF762BB581EBF8A0839B85D
+      DF0D08AB1792729176824FE037F6C0A66DFB056059169148E41B85D04A369646
+      E1377523B6F14CDA5D705D242DA8A418F55E43747D1CA6C7A761BC7FBC5E02F4
+      F6F6C26030C06C364BB23E3D8BE89607315E0F3144CE20A4FD4DA388EF7CC067
+      EB30665B145A09D0D9D96921BF31D232769D223DAB617CA0C2EB8E4618DA4F62
+      B6AD01FA7B27C0B6D663E68E1233B71509F6E631F34F6485AC66C360414B0000
+      000049454E44AE426082
+    }
+    Transparent = False
+  end
   object DismissBtn: TButton
-    Left = 320
+    Left = 229
     Height = 25
-    Top = 16
+    Top = 168
     Width = 75
     Caption = 'DismissBtn'
     OnClick = DismissBtnClick
@@ -65,7 +89,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
   object SnoozeBtn: TButton
     Left = 320
     Height = 25
-    Top = 48
+    Top = 136
     Width = 75
     Caption = 'SnoozeBtn'
     OnClick = SnoozeBtnClick
@@ -74,43 +98,18 @@ object AlarmNotifyForm: TAlarmNotifyForm
   object OpenItemBtn: TButton
     Left = 320
     Height = 25
-    Top = 96
+    Top = 168
     Width = 75
     Caption = 'OpenItemBtn'
     Default = True
     OnClick = OpenItemBtnClick
     TabOrder = 2
   end
-  object SubjectEdit: TEdit
-    Left = 8
-    Height = 21
-    Top = 19
-    Width = 297
-    ReadOnly = True
-    TabOrder = 3
-  end
-  object NotesMemo: TMemo
-    Left = 8
-    Height = 97
-    Top = 64
-    Width = 297
-    Lines.Strings = (
-      '1'
-      '2'
-      '3'
-      '4'
-      '5'
-      '6'
-    )
-    ReadOnly = True
-    ScrollBars = ssVertical
-    TabOrder = 4
-  end
   object SnoozeCombo: TComboBox
-    Left = 290
+    Left = 136
     Height = 21
-    Top = 178
-    Width = 106
+    Top = 136
+    Width = 168
     AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
     ItemHeight = 13
     Items.Strings = (
@@ -138,7 +137,7 @@ object AlarmNotifyForm: TAlarmNotifyForm
     OnChange = SnoozeComboChange
     ParentColor = True
     Style = csDropDownList
-    TabOrder = 5
+    TabOrder = 3
   end
   object EventDialog: TVpEventEditDialog
     Version = 'v1.03'
diff --git a/components/tvplanit/source/vpalarmdlg.lrs b/components/tvplanit/source/vpalarmdlg.lrs
index 9f86707f8..338cac93b 100644
--- a/components/tvplanit/source/vpalarmdlg.lrs
+++ b/components/tvplanit/source/vpalarmdlg.lrs
@@ -1,40 +1,66 @@
 { Das ist eine automatisch erzeugte Lazarus-Ressourcendatei }
 
 LazarusResources.Add('TAlarmNotifyForm','FORMDATA',[
-  '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
+  'TPF0'#16'TAlarmNotifyForm'#15'AlarmNotifyForm'#4'Left'#3#10#1#6'Height'#3#205
+  +#0#3'Top'#3#174#0#5'Width'#3#151#1#18'HorzScrollBar.Page'#3#150#1#18'VertScr'
+  +'ollBar.Page'#3#204#0#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7
+  +#8'bsDialog'#7'Caption'#6#8'Reminder'#12'ClientHeight'#3#205#0#11'ClientWidt'
+  +'h'#3#151#1#5'Color'#7#8'clWindow'#10'KeyPreview'#9#9'OnKeyDown'#7#11'FormKe'
+  +'yDown'#6'OnShow'#7#8'FormShow'#8'Position'#7#9'poDefault'#0#6'TLabel'#13'Sn'
+  +'oozeCaption'#4'Left'#2'0'#6'Height'#2#13#3'Top'#3#136#0#5'Width'#2'N'#9'Ali'
+  +'gnment'#7#14'taRightJustify'#8'AutoSize'#8#7'Caption'#6#13'SnoozeCaption'#11
+  +'ParentColor'#8#0#0#6'TLabel'#8'lSubject'#4'Left'#2'0'#6'Height'#2#14#3'Top'
+  +#2#8#5'Width'#2'/'#7'Caption'#6#8'lSubject'#10'Font.Style'#11#6'fsBold'#0#11
+  +'ParentColor'#8#0#0#6'TLabel'#6'lNotes'#4'Left'#2'0'#6'Height'#2'`'#3'Top'#2
+  +' '#5'Width'#3'X'#1#8'AutoSize'#8#7'Caption'#6#6'lNotes'#11'ParentColor'#8#8
+  +'WordWrap'#9#0#0#6'TImage'#6'Image1'#4'Left'#2#5#6'Height'#2#18#3'Top'#2#8#5
+  +'Width'#2#19#12'Picture.Data'#10#234#2#0#0#23'TPortableNetworkGraphic'#206#2
+  +#0#0#137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243
+  +#255'a'#0#0#2#149'IDATx'#218#133#147#239'KSQ'#24#199#157#14' *'#254'@_('#10
+  +#9#195'Y'#18'n'#175#202'^'#10#245#15#4'A'#245#162'wQo'#163'"-L'#141#10'A'#154
+  +'`'#5#130#166#248#162#152'^'#17#157#8#222#185#246#195#238#230'JCjS'#247#195
+  +#173#197#180#233#238'J'#187#243#206#217#190#157's'#183'Ya'#214#133#239'}'#238
+  +'9'#207#249'~'#206#243#28#206#205#0#144'AE'#30#153'R'#169'l'#214'h4'#243#10
+  +#133#226#28#25#203#233'\Jr'#149'Ju'#166#175#175#143#163'k'#232#220#129#143
+  +#190#220'$pDv'#157#14#193'`'#16#182#137#9'i'#236'N'#137'~/LOK'#185'wSS'#7#185
+  +#212#198#25'2:X'#202#201#129#195'bA '#16#192'G'#18#223'ge!'#156#153')iQ&'#131
+  +'cnN'#202#209'5'#139')@'#170#186'$`5?'#31#204#224' |>'#31#152#129#1','#148
+  +#149#193'_R'#2'a!'#222#230#229#129#233#239'O'#230'Ht'#254#13#176'YT'#4'}]'
+  +#29#158'WU'#129#173#169#129#167#186#26'k'#149#149#240#150#151#195'I@'#186#130
+  +#2#244#228#230'b2;'#27'AR'#209'!'#192'Ni)'#190'45aC'#173#198'zC'#3#2#4#230
+  +#175#173#197#26#1'y'#8#200']Q'#1#23#169#202']\'#140#176'\'#254''''#192'f'#179
+  +'a'#255'Hm'#175's'#8#204#223#133#176#29#162#7''''#205'Q'#207#145#0'A'#16'`'
+  +#183#219#193#243'<'#236'6'#11'V'#216#235#8#187#180#216't'#14'!'#145'H'#252#31
+  +'@'#205'ccc'#136#199#227#8'-'#191'$'#198'a'#196#191#187#177'2y'#9';!'#7'DQ'
+  +#132#213'j='#12#160#134'4'#132'a'#24#8#188#151#152'.C'#220#156#132#24#236#6
+  +#239#209#193#163'o%'#149'm'#29#13'H'#139'aF'#241#137#235#194#214#202#8#196'@'
+  +';L'#143#212#216#11#143'`'#177#191#25#206'7'#175#192'q'#220#191#1#211'#'#26
+  +#172#233'['#16#11#13'!'#234#190#2#211#195'F'#236#250'o'#225#171'w'#10#11'/'
+  +#206#195'n'#181#224#224'*S'#0'1'#253'H'#155#247'b'#187'X'#30#191#138#8'9'#184
+  +']'#223#13#8#171#23#146'r'#145'v'#130'O'#224'7'#246#192#166'm'#251#5'`Y'#22
+  +#145'H'#228#27#133#208'J6'#150'F'#225'7u#'#182#241'L'#218']p]$-'#168#164#24
+  +#245'^Ct}'#28#166#199#167'a'#188''#188'^'#2#244#246#246#194'`0'#192'l6K'#178
+  +'>='#139#232#150#7'1^'#15'1D'#206' '#164#253'M'#163#136#239'|'#192'g'#235'0f'
+  +'['#20'Z'#9#208#217#217'i!'#191'1'#210'2v'#157'"='#171'a|'#160#194#235#142'F'
+  +#24#218'Ob'#182#173#1#250'{'''#192#182#214'c'#230#142#18'3'#183#21#9#246#230
+  +'1'#243'Od'#133#172'f'#195'`AK'#0#0#0#0'IEND'#174'B`'#130#11'Transparent'#8#0
+  +#0#7'TButton'#10'DismissBtn'#4'Left'#3#229#0#6'Height'#2#25#3'Top'#3#168#0#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'#3#136#0#5'Width'#2'K'#7'Caption'#6#9'SnoozeBtn'#7'OnClick'#7#14'SnoozeB'
+  +'tnClick'#8'TabOrder'#2#1#0#0#7'TButton'#11'OpenItemBtn'#4'Left'#3'@'#1#6'He'
+  +'ight'#2#25#3'Top'#3#168#0#5'Width'#2'K'#7'Caption'#6#11'OpenItemBtn'#7'Defa'
+  +'ult'#9#7'OnClick'#7#16'OpenItemBtnClick'#8'TabOrder'#2#2#0#0#9'TComboBox'#11
+  +'SnoozeCombo'#4'Left'#3#136#0#6'Height'#2#21#3'Top'#3#136#0#5'Width'#3#168#0
+  +#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#3#0#0#18'TVpEventEditDialog'#11'EventDialo'
+  +'g'#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'Placeme'
+  +'nt.Height'#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 63ed9f4e8..3fd967939 100644
--- a/components/tvplanit/source/vpalarmdlg.pas
+++ b/components/tvplanit/source/vpalarmdlg.pas
@@ -50,18 +50,15 @@ type
   { TAlarmNotifyForm }
 
   TAlarmNotifyForm = class(TForm)
-    Bevel1: TBevel;
-    Bevel2: TBevel;
     DismissBtn: TButton;
     EventDialog: TVpEventEditDialog;
-    NotesCaption: TLabel;
-    NotesMemo: TMemo;
+    Image1: TImage;
+    lSubject: TLabel;
+    lNotes: TLabel;
     OpenItemBtn: TButton;
     SnoozeBtn: TButton;
     SnoozeCaption: TLabel;
     SnoozeCombo: TComboBox;
-    SubjectCaption: TLabel;
-    SubjectEdit: TEdit;
     procedure SnoozeComboChange(Sender: TObject);
     procedure SnoozeBtnClick(Sender: TObject);
     procedure DismissBtnClick(Sender: TObject);
@@ -149,14 +146,14 @@ procedure TAlarmNotifyForm.PopulateSelf;
 begin
   if Event <> nil then begin
     Caption := RSReminder;
-    SubjectCaption.Caption := RSSubjectCaption;
-    NotesCaption.Caption := RSNotesCaption;
+//    SubjectCaption.Caption := RSSubjectCaption;
+//    NotesCaption.Caption := RSNotesCaption;
     SnoozeCaption.Caption := RSSnoozeCaption;
     DismissBtn.Caption := RSDismissBtn;
     SnoozeBtn.Caption := RSSnoozeBtn;
     OpenItemBtn.Caption := RSOpenItemBtn;
-    NotesMemo.Text := Event.Note;
-    SubjectEdit.Text := Event.Description;
+    lNotes.Caption := Event.Note;
+    lSubject.Caption := Event.Description;
 
     if Now > Event.StartTime then
       Self.Caption := RSOverdue + ' : '