diff --git a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html
index c4e107131..9c7fc4cd5 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html
+++ b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html
@@ -1,2 +1,2 @@
 <#IsSubject>Gebeurtenis geannuleerd: <#summary/></#IsSubject>
-<#IsBody><#organizer/> heeft deze gebeurtenis geannuleerd: « <#summary/> ».</#IsBody>
\ No newline at end of file
+<#IsBody><#organizer/> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>heeft deze gebeurtenis geannuleerd: « <#summary/> ».</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod
+++ b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html
index 8e2bf817d..02a92f4c2 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html
+++ b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html
@@ -1,2 +1,2 @@
 <#IsSubject>Uitnodiging voor gebeurtenis: <#summary/></#IsSubject>
-<#IsBody><#organizer/> heeft u uitgenodigd voor <#summary/>.</#IsBody>
\ No newline at end of file
+<#IsBody><#organizer/> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>heeft u uitgenodigd voor <#summary/>.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod
+++ b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html
index b28fed22d..a025bde4d 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html
+++ b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html
@@ -1,2 +1,2 @@
 <#IsSubject>Événement annulé : « <#summary/> »</#IsSubject>
-<#IsBody><#organizer/> a annulé cet événement : « <#summary/> ».</#IsBody>
\ No newline at end of file
+<#IsBody><#organizer/> <#HasSentBy>(envoyé par <#sentBy/>) </#HasSentBy>a annulé cet événement : « <#summary/> ».</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod
+++ b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html
index 835952a13..8a4ec4b82 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html
+++ b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html
@@ -1,2 +1,2 @@
 <#IsSubject>Invitation : <#summary/></#IsSubject>
-<#IsBody><#organizer/> vous a invité à « <#summary/> ».</#IsBody>
+<#IsBody><#organizer/> <#HasSentBy>(envoyé par <#sentBy/>) </#HasSentBy>vous a invité à « <#summary/> ».</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod
+++ b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html
index 43b8d5c9b..3c0264a20 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html
+++ b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html
@@ -1,2 +1,2 @@
 <#IsSubject>Termin abgesagt: <#summary/></#IsSubject>
-<#IsBody><#organizer/> hat diesen Termin abgesagt: <#summary/></#IsBody>
+<#IsBody><#organizer/> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>hat diesen Termin abgesagt: <#summary/></#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod
+++ b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html
index 9500e1fa9..3f6163919 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html
+++ b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html
@@ -1,2 +1,2 @@
 <#IsSubject>Termineinladung: <#summary/></#IsSubject>
-<#IsBody><#organizer/> hat Sie zu <#summary/> eingeladen.</#IsBody>
+<#IsBody><#organizer/> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>hat Sie zu <#summary/> eingeladen.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod
+++ b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html
index ee71e81e4..754921b66 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html
+++ b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html
@@ -1,2 +1,2 @@
 <#IsSubject>Evento cancellato : " <#summary/> "</#IsSubject>
-<#IsBody><#organizer/> ha cancellato questo elemento: " <#summary/> ".</#IsBody>
\ No newline at end of file
+<#IsBody><#organizer/> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>ha cancellato questo elemento: " <#summary/> ".</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod
+++ b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html
index 131c012b8..7dbc92fb8 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html
+++ b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html
@@ -1,2 +1,2 @@
 <#IsSubject>Invito evento: <#summary/></#IsSubject>
-<#IsBody>Si è stati invitati da <#organizer> a <#summary/>.</#IsBody>
\ No newline at end of file
+<#IsBody>Si è stati invitati da <#organizer> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>a <#summary/>.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod
index 6d3d52eca..66b51444b 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod
+++ b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html
index f70c7ff33..97636c29a 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html
+++ b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html
@@ -1,2 +1,2 @@
 <#IsSubject>Evento cancelado: <#summary/></#IsSubject>
-<#IsBody><#organizer/> ha cancelado este evento: « <#summary/> ».</#IsBody>
\ No newline at end of file
+<#IsBody><#organizer/> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>ha cancelado este evento: « <#summary/> ».</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod
+++ b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html
index 88d568790..22ddafe96 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html
+++ b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html
@@ -1,2 +1,2 @@
 <#IsSubject>Invitación a evento: <#summary/></#IsSubject>
-<#IsBody><#organizer/> le ha invitado a <#summary/>.</#IsBody>
+<#IsBody><#organizer/> <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy>le ha invitado a <#summary/>.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod
index 6d3d52eca..92428f429 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod
+++ b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod
@@ -16,3 +16,12 @@ summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file