diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm smeserver-vacation-1.1/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm
--- smeserver-vacation-1.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm	2024-02-16 13:40:32.243267567 +0000
+++ smeserver-vacation-1.1/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm	2024-02-16 12:16:00.000000000 +0000
@@ -252,9 +252,13 @@
     my $away = $q->l('vac_AWAY_FROM_MAIL');
     my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER');
 
-    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
+    #my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
+    #                      "\n$away\n"."\n--\n$fullname";
+
+    my $ExistingMessage = "$from $fullname \<$user\@$domain\>\n"."$Subject $return\n".
                           "\n$away\n"."\n--\n$fullname";
 
+
     # if exists and is not empty
     if (( -e $vfile ) && (! -z $vfile ))
     {
diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep
--- smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep	2024-02-16 13:40:32.268268257 +0000
+++ smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep	2024-02-16 15:49:00.000000000 +0000
@@ -36,7 +36,8 @@
 			<span class=label>
 				%=l 'vac_MESSAGE'
 			</span>
-			<span class=data>
+			<span class=data>		
+				% $VacText = b("$VacText");	
 				%=text_area 'VacText' => $VacText, cols=>40, rows=>15
 			</span><br>
 			<span class=label>
diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep
--- smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep	2024-02-16 13:40:32.245267623 +0000
+++ smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep	2024-02-16 13:38:00.000000000 +0000
@@ -9,7 +9,7 @@
             <br>
 			%=l 'vac_NO_FORWARDS'
     %	} else {
-   		<table class="sme-border"><tbody>
+   		<table class="sme-border TableSort"><thead>
 		<tr>
 			<th class='sme-border'>
 				%=l 'ACCOUNT'
@@ -31,6 +31,7 @@
 				%=l 'ACTION'
 			</th>
 		</tr>
+		</thead><tbody>
         % foreach my $vacation (@$vacations) {
         <tr>
 			%= t td => (class => 'sme-border') => $vacation->{"User"}