fix(mail): improve reply and forward templates

Fixes #5415
Alinto · Jan 26, 2022 · 929c6b1 · 929c6b1
1 parent 3eec819
commit 929c6b1
Show file tree

Hide file tree

Showing 86 changed files with 1,388 additions and 1,358 deletions.
diff --git a/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.html b/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.html
@@ -1,16 +1,15 @@
-<#newLine/>
-<#newLine/>
-<#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/></#signaturePlacementOnTop>
--------- الرسالة الاصلية --------<#newLine/>
-الموضوع: <#subject/><#newLine/>
-التاريخ: <#date/><#newLine/>
-من: <#from/><#newLine/>
-<#hasReplyTo>ردً على: <#replyTo/></#hasReplyTo><#hasOrganization>المنظمة: <#organization/></#hasOrganization>إلى: <#to/><#newLine/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>مجموعات الأخبار: <#newsgroups/></#hasNewsGroups><#hasReferences>المراجع: <#references/></#hasReferences><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#signaturePlacementOnBottom><#newLine/>
-<#newLine/>
-<#signature/></#signaturePlacementOnBottom>
-<#newLine/>
+<#newLine/><#newLine
+/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+>-------- الرسالة الاصلية --------<#newLine
+/>الموضوع: <#subject/><#newLine
+/>التاريخ: <#date/><#newLine
+/>من: <#from/><#newLine
+/><#hasReplyTo>ردً على: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>المنظمة: <#organization/><#newLine/></#hasOrganization
+>إلى: <#to/><#newLine
+/><#hasCc>CC: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>مجموعات الأخبار: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>المراجع: <#references/><#newLine/></#hasReferences
+><#newLine/><#newLine
+/><#messageBody
+/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailArabicReply.wo/SOGoMailArabicReply.html b/SoObjects/Mailer/SOGoMailArabicReply.wo/SOGoMailArabicReply.html
@@ -1,16 +1,18 @@
-<#replyPlacementOnTop><#newLine/>
-<#newLine/>
-</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/>
-</#signaturePlacementOnTop><#outlookMode>-------- الرسالة الأصلية --------<#newLine/>
-الموضوع: <#subject/><#newLine/>
-التاريخ: <#date/><#newLine/>
-من: <#from/><#newLine/>
-<#hasReplyTo>ردً علي: <#replyTo/></#hasReplyTo><#hasOrganization>المنظمة: <#organization/></#hasOrganization>إلى: <#to/><#newLine/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>مجموعات الأخبار: <#newsgroups/></#hasNewsGroups><#hasReferences>المراجع: <#references/></#hasReferences></#outlookMode><#newLine/>
-<#standardMode>في <#date/>, <#from/> كتب:</#standardMode><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#replyPlacementOnBottom><#newLine/>
-<#newLine/>
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>
+<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop
+><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+><#outlookMode
+>-------- الرسالة الأصلية --------<#newLine
+/>الموضوع: <#subject/><#newLine
+/>التاريخ: <#date/><#newLine
+/>من: <#from/><#newLine
+/><#hasReplyTo>ردً علي: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>المنظمة: <#organization/><#newLine/></#hasOrganization
+>إلى: <#to/><#newLine
+/><#hasCc>CC: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>مجموعات الأخبار: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>المراجع: <#references/><#newLine/></#hasReferences
+></#outlookMode
+><#standardMode>في <#date/>, <#from/> كتب:</#standardMode
+><#newLine/><#newLine/><#messageBody
+/><#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom
+><#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailBasqueForward.wo/SOGoMailBasqueForward.html b/SoObjects/Mailer/SOGoMailBasqueForward.wo/SOGoMailBasqueForward.html
@@ -1,16 +1,15 @@
-<#newLine/>
-<#newLine/>
-<#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/></#signaturePlacementOnTop>
--------- Original Message --------<#newLine/>
-Gaia: <#subject/><#newLine/>
-Data: <#date/><#newLine/>
-Nork: <#from/><#newLine/>
-<#hasReplyTo>Erantzun-honi: <#replyTo/></#hasReplyTo><#hasOrganization>Erakundea: <#organization/></#hasOrganization>Nori: <#to/><#newLine/>
-<#hasCc>Kopia: <#cc/></#hasCc><#hasNewsGroups>Berri-taldeak: <#newsgroups/></#hasNewsGroups><#hasReferences>Erreferentziak: <#references/></#hasReferences><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#signaturePlacementOnBottom><#newLine/>
-<#newLine/>
-<#signature/></#signaturePlacementOnBottom>
-<#newLine/>
+<#newLine/><#newLine
+/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+>-------- Original Message --------<#newLine
+/>Gaia: <#subject/><#newLine
+/>Data: <#date/><#newLine
+/>Nork: <#from/><#newLine
+/><#hasReplyTo>Erantzun-honi: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Erakundea: <#organization/><#newLine/></#hasOrganization
+>Nori: <#to/><#newLine
+/><#hasCc>Kopia: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Berri-taldeak: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>Erreferentziak: <#references/><#newLine/></#hasReferences
+><#newLine/><#newLine
+/><#messageBody
+/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailBasqueReply.wo/SOGoMailBasqueReply.html b/SoObjects/Mailer/SOGoMailBasqueReply.wo/SOGoMailBasqueReply.html
@@ -1,16 +1,18 @@
-<#replyPlacementOnTop><#newLine/>
-<#newLine/>
-</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/>
-</#signaturePlacementOnTop><#outlookMode>-------- Jatorrizko Mezua --------<#newLine/>
-Gaia: <#subject/><#newLine/>
-Data: <#date/><#newLine/>
-Nork: <#from/><#newLine/>
-<#hasReplyTo>Erantzun-honi: <#replyTo/></#hasReplyTo><#hasOrganization>Erakundea: <#organization/></#hasOrganization>Nori: <#to/><#newLine/>
-<#hasCc>Kopia: <#cc/></#hasCc><#hasNewsGroups>Berri-taldeak: <#newsgroups/></#hasNewsGroups><#hasReferences>Erreferentziak: <#references/></#hasReferences></#outlookMode><#newLine/>
-<#standardMode><#date/>-an, <#from/>-k idatzi zuen:</#standardMode><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#replyPlacementOnBottom><#newLine/>
-<#newLine/>
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>
+<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop
+><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+><#outlookMode
+>-------- Jatorrizko Mezua --------<#newLine
+/>Gaia: <#subject/><#newLine
+/>Data: <#date/><#newLine
+/>Nork: <#from/><#newLine
+/><#hasReplyTo>Erantzun-honi: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Erakundea: <#organization/><#newLine/></#hasOrganization
+>Nori: <#to/><#newLine
+/><#hasCc>Kopia: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Berri-taldeak: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>Erreferentziak: <#references/><#newLine/></#hasReferences
+></#outlookMode
+><#standardMode><#date/>-an, <#from/>-k idatzi zuen:</#standardMode
+><#newLine/><#newLine/><#messageBody
+/><#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom
+><#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailBosnianForward.wo/SOGoMailBosnianForward.html b/SoObjects/Mailer/SOGoMailBosnianForward.wo/SOGoMailBosnianForward.html
@@ -1,16 +1,15 @@
-<#newLine/>
-<#newLine/>
-<#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/></#signaturePlacementOnTop>
--------- Originalan E-mail --------<#newLine/>
-Tema: <#subject/><#newLine/>
-Datum: <#date/><#newLine/>
-Od: <#from/><#newLine/>
-<#hasReplyTo>Odgovori: <#replyTo/></#hasReplyTo><#hasOrganization>Organizacija: <#organization/></#hasOrganization>Za: <#to/><#newLine/>
-<#hasCc>Kopiraj: <#cc/></#hasCc><#hasNewsGroups>Grupe: <#newsgroups/></#hasNewsGroups><#hasReferences>Reference: <#references/></#hasReferences><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#signaturePlacementOnBottom><#newLine/>
-<#newLine/>
-<#signature/></#signaturePlacementOnBottom>
-<#newLine/>
+<#newLine/><#newLine
+/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+>-------- Originalan E-mail --------<#newLine
+/>Tema: <#subject/><#newLine
+/>Datum: <#date/><#newLine
+/>Od: <#from/><#newLine
+/><#hasReplyTo>Odgovori: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Organizacija: <#organization/><#newLine/></#hasOrganization
+>Za: <#to/><#newLine
+/><#hasCc>Kopiraj: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Grupe: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>Reference: <#references/><#newLine/></#hasReferences
+><#newLine/><#newLine
+/><#messageBody
+/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailBosnianReply.wo/SOGoMailBosnianReply.html b/SoObjects/Mailer/SOGoMailBosnianReply.wo/SOGoMailBosnianReply.html
@@ -1,16 +1,18 @@
-<#replyPlacementOnTop><#newLine/>
-<#newLine/>
-</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/>
-</#signaturePlacementOnTop><#outlookMode>-------- Originalan E-mail --------<#newLine/>
-Tema: <#subject/><#newLine/>
-Datum: <#date/><#newLine/>
-Od: <#from/><#newLine/>
-<#hasReplyTo>Odgovori: <#replyTo/></#hasReplyTo><#hasOrganization>Organizacija: <#organization/></#hasOrganization>Za: <#to/><#newLine/>
-<#hasCc>Kopiraj: <#cc/></#hasCc><#hasNewsGroups>Grupe: <#newsgroups/></#hasNewsGroups><#hasReferences>Refererence: <#references/></#hasReferences></#outlookMode><#newLine/>
-<#standardMode>Dana <#date/>, <#from/> napisao/napisala:</#standardMode><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#replyPlacementOnBottom><#newLine/>
-<#newLine/>
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>
+<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop
+><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+><#outlookMode
+>-------- Originalan E-mail --------<#newLine
+/>Tema: <#subject/><#newLine
+/>Datum: <#date/><#newLine
+/>Od: <#from/><#newLine
+/><#hasReplyTo>Odgovori: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Organizacija: <#organization/><#newLine/></#hasOrganization
+>Za: <#to/><#newLine
+/><#hasCc>Kopiraj: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Grupe: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>Refererence: <#references/><#newLine/></#hasReferences
+></#outlookMode
+><#standardMode>Dana <#date/>, <#from/> napisao/napisala:</#standardMode
+><#newLine/><#newLine/><#messageBody
+/><#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom
+><#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/...ects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.html b/...ects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.html
@@ -1,16 +1,15 @@
-<#newLine/>
-<#newLine/>
-<#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/></#signaturePlacementOnTop>
--------- Original Message --------<#newLine/>
-Assunto: <#subject/><#newLine/>
-Data: <#date/><#newLine/>
-De: <#from/><#newLine/>
-<#hasReplyTo>Responder-Para: <#replyTo/></#hasReplyTo><#hasOrganization>Organização: <#organization/></#hasOrganization>Para: <#to/><#newLine/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Referências: <#references/></#hasReferences><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#signaturePlacementOnBottom><#newLine/>
-<#newLine/>
-<#signature/></#signaturePlacementOnBottom>
-<#newLine/>
+<#newLine/><#newLine
+/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+>-------- Original Message --------<#newLine/>
+Assunto: <#subject/><#newLine/>
+Data: <#date/><#newLine
+/>De: <#from/><#newLine
+/><#hasReplyTo>Responder-Para: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Organização: <#organization/><#newLine/></#hasOrganization
+>Para: <#to/><#newLine
+/><#hasCc>CC: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Newsgroups: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>Referências: <#references/><#newLine/></#hasReferences
+><#newLine/><#newLine
+/><#messageBody
+/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailBrazilianPortugueseReply.wo/SOGoMailBrazilianPortugueseReply.html b/SoObjects/Mailer/SOGoMailBrazilianPortugueseReply.wo/SOGoMailBrazilianPortugueseReply.html
@@ -1,17 +1,18 @@
-<#signaturePlacementOnTop>
-
-
-<#signature/>
-</#signaturePlacementOnTop>
-<#outlookMode>-------- Mensagem Original --------
-Assunto: <#subject/>
-Data: <#date/>
-De: <#from/>
-<#hasReplyTo>Responder-Para: <#replyTo/></#hasReplyTo><#hasOrganization>Organização: <#organization/></#hasOrganization>Para: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Referências: <#references/></#hasReferences></#outlookMode>
-<#standardMode>Em <#date/>, <#from/> escreveu:</#standardMode>
-
-<#messageBody/>
-
-
-<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop
+><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+><#outlookMode
+>-------- Mensagem Original --------<#newLine
+/>Assunto: <#subject/><#newLine
+/>Data: <#date/><#newLine
+/>De: <#from/><#newLine
+/><#hasReplyTo>Responder-Para: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Organização: <#organization/><#newLine/></#hasOrganization
+>Para: <#to/><#newLine
+/><#hasCc>CC: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Newsgroups: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>Referências: <#references/><#newLine/></#hasReferences
+></#outlookMode
+><#standardMode>Em <#date/>, <#from/> escreveu:</#standardMode
+><#newLine/><#newLine/><#messageBody
+/><#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom
+><#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailBulgarianForward.wo/SOGoMailBulgarianForward.html b/SoObjects/Mailer/SOGoMailBulgarianForward.wo/SOGoMailBulgarianForward.html
@@ -1,16 +1,15 @@
-<#newLine/>
-<#newLine/>
-<#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/></#signaturePlacementOnTop>
--------- Original Message --------<#newLine/>
-Subject: <#subject/><#newLine/>
-Date: <#date/><#newLine/>
-From: <#from/><#newLine/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/><#newLine/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#signaturePlacementOnBottom><#newLine/>
-<#newLine/>
-<#signature/></#signaturePlacementOnBottom>
-<#newLine/>
+<#newLine/><#newLine
+/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+>-------- Original Message --------<#newLine
+/>Subject: <#subject/><#newLine
+/>Date: <#date/><#newLine
+/>From: <#from/><#newLine
+/><#hasReplyTo>Reply-To: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Organization: <#organization/><#newLine/></#hasOrganization
+>To: <#to/><#newLine
+/><#hasCc>CC: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Newsgroups: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>References: <#references/><#newLine/></#hasReferences
+><#newLine/><#newLine
+/><#messageBody
+/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailBulgarianReply.wo/SOGoMailBulgarianReply.html b/SoObjects/Mailer/SOGoMailBulgarianReply.wo/SOGoMailBulgarianReply.html
@@ -1,16 +1,18 @@
-<#replyPlacementOnTop><#newLine/>
-<#newLine/>
-</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/>
-</#signaturePlacementOnTop><#outlookMode>-------- Original Message --------<#newLine/>
-Subject: <#subject/><#newLine/>
-Date: <#date/><#newLine/>
-From: <#from/><#newLine/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/><#newLine/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences></#outlookMode><#newLine/>
-<#standardMode>On <#date/>, <#from/> wrote:</#standardMode><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#replyPlacementOnBottom><#newLine/>
-<#newLine/>
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>
+<#replyPlacementOnTop><#newLine/><#newLine/></#replyPlacementOnTop
+><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+><#outlookMode
+>-------- Original Message --------<#newLine
+/>Subject: <#subject/><#newLine
+/>Date: <#date/><#newLine
+/>From: <#from/><#newLine
+/><#hasReplyTo>Reply-To: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Organization: <#organization/><#newLine/></#hasOrganization
+>To: <#to/><#newLine
+/><#hasCc>CC: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Newsgroups: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>References: <#references/><#newLine/></#hasReferences
+></#outlookMode
+><#standardMode>On <#date/>, <#from/> wrote:</#standardMode
+><#newLine/><#newLine/><#messageBody
+/><#replyPlacementOnBottom><#newLine/><#newLine/></#replyPlacementOnBottom
+><#signaturePlacementOnBottom><#newLine/><#signature/></#signaturePlacementOnBottom>
diff --git a/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html
@@ -1,16 +1,15 @@
-<#newLine/>
-<#newLine/>
-<#signaturePlacementOnTop><#newLine/>
-<#signature/><#newLine/></#signaturePlacementOnTop>
--------- Original Message --------<#newLine/>
-Subject: <#subject/><#newLine/>
-Date: <#date/><#newLine/>
-From: <#from/><#newLine/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/><#newLine/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
-<#newLine/>
-<#messageBody/><#newLine/>
-<#signaturePlacementOnBottom><#newLine/>
-<#newLine/>
-<#signature/></#signaturePlacementOnBottom>
-<#newLine/>
+<#newLine/><#newLine
+/><#signaturePlacementOnTop><#signature/><#newLine/><#newLine/></#signaturePlacementOnTop
+>-------- Original Message --------<#newLine
+/>Subject: <#subject/><#newLine
+/>Date: <#date/><#newLine
+/>From: <#from/><#newLine
+/><#hasReplyTo>Reply-To: <#replyTo/><#newLine/></#hasReplyTo
+><#hasOrganization>Organization: <#organization/><#newLine/></#hasOrganization
+>To: <#to/><#newLine
+/><#hasCc>CC: <#cc/><#newLine/></#hasCc
+><#hasNewsGroups>Newsgroups: <#newsgroups/><#newLine/></#hasNewsGroups
+><#hasReferences>References: <#references/><#newLine/></#hasReferences
+><#newLine/><#newLine
+/><#messageBody
+/><#signaturePlacementOnBottom><#newLine/><#newLine/><#signature/></#signaturePlacementOnBottom>