merge of '326cbf2748cd4309c0cacb9702c86cdb705dadfe'

and 'ba6d913f4f8a20f6769ab7fd45973e1fbdee1e68'

Monotone-Parent: 326cbf2748cd4309c0cacb9702c86cdb705dadfe
Monotone-Parent: ba6d913f4f8a20f6769ab7fd45973e1fbdee1e68
Monotone-Revision: 3c15622e01ba189cb753c80fb8cf4c1a57e85c29

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-26T17:31:12
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- 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/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html

@@ -1,16 +1,16 @@
-<#replyPlacementOnTop>
-
-</#replyPlacementOnTop><#signaturePlacementOnTop>
-<#signature/>
-</#signaturePlacementOnTop><#outlookMode>-------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences></#outlookMode>
-<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
-
-<#messageBody/>
-<#replyPlacementOnBottom>
-
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#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/>

SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- 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/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html

@@ -1,16 +1,16 @@
-<#replyPlacementOnTop>
-
-</#replyPlacementOnTop><#signaturePlacementOnTop>
-<#signature/>
-</#signaturePlacementOnTop><#outlookMode>-------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences></#outlookMode>
-<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
-
-<#messageBody/>
-<#replyPlacementOnBottom>
-
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#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/>

SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailForward.h

@@ -32,6 +32,7 @@
   SOGoMailObject *sourceMail;
   NSString *field;
   NSString *currentValue;
+  BOOL htmlComposition;
 }
 
 - (void) setSourceMail: (SOGoMailObject *) newSourceMail;

SoObjects/Mailer/SOGoMailForward.m

@@ -21,6 +21,7 @@
  */
 
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGExtensions/NSString+misc.h>
 
 #import <SoObjects/SOGo/SOGoDateFormatter.h>
 #import <SoObjects/SOGo/SOGoUser.h>
@@ -34,6 +35,10 @@
 {
   if ((self = [super init]))
     {
+      NSUserDefaults *ud;
+      ud = [[context activeUser] userDefaults];
+      htmlComposition = [[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"];
+
       sourceMail = nil;
       currentValue = nil;
     }
@@ -53,6 +58,16 @@
   ASSIGN (sourceMail, newSourceMail);
 }
 
+- (NSString *) newLine
+{
+  NSString *rc = [NSString stringWithString: @" "];
+  
+  if (htmlComposition)
+    rc = [NSString stringWithString: @"<br/>"];
+
+  return rc;
+}
+
 - (NSString *) subject
 {
   return [sourceMail decodedSubject];
@@ -69,7 +84,14 @@
 
 - (NSString *) from
 {
-  return [[sourceMail mailHeaders] objectForKey: @"from"];
+  NSString *rc;
+
+  if (htmlComposition)
+    rc = [[[sourceMail mailHeaders] objectForKey: @"from"] stringByEscapingHTMLString];
+  else
+    rc = [[sourceMail mailHeaders] objectForKey: @"from"];
+
+  return rc;
 }
 
 - (NSString *) _headerField: (NSString *) fieldName
@@ -91,8 +113,15 @@
 
 - (NSString *) replyTo
 {
-  return ([NSString stringWithFormat: @"%@\n",
-		    [self _headerField: @"reply-to"]]);
+  NSString *rc;
+
+  if (htmlComposition)
+    rc = [NSString stringWithFormat: @"%@<br/>", 
+          [[self _headerField: @"reply-to"] stringByEscapingHTMLString]];
+  else
+    rc = ([NSString stringWithFormat: @"%@\n", [self _headerField: @"reply-to"]]);
+
+  return rc;
 }
 
 - (BOOL) hasOrganization
@@ -102,13 +131,26 @@
 
 - (NSString *) organization
 {
-  return ([NSString stringWithFormat: @"%@\n",
-		    [self _headerField: @"organization"]]);
+  NSString *rc;
+
+  if (htmlComposition)
+    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"organization"]];
+  else
+    rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"organization"]];
+
+  return rc;
 }
 
 - (NSString *) to
 {
-  return [[sourceMail mailHeaders] objectForKey: @"to"];
+  NSString *rc;
+
+  if (htmlComposition)
+    rc = [[[sourceMail mailHeaders] objectForKey: @"to"] stringByEscapingHTMLString];
+  else
+    rc = [[sourceMail mailHeaders] objectForKey: @"to"];
+
+  return rc;
 }
 
 - (BOOL) hasCc
@@ -118,8 +160,15 @@
 
 - (NSString *) cc
 {
-  return ([NSString stringWithFormat: @"%@\n",
-		    [self _headerField: @"cc"]]);
+  NSString *rc;
+
+  if (htmlComposition)
+    rc = [NSString stringWithFormat: @"%@<br/>", 
+          [[self _headerField: @"cc"] stringByEscapingHTMLString]];
+  else
+    rc = ([NSString stringWithFormat: @"%@\n", [self _headerField: @"cc"]]);
+
+  return rc;
 }
 
 - (BOOL) hasNewsGroups
@@ -129,8 +178,14 @@
 
 - (NSString *) newsgroups
 {
-  return ([NSString stringWithFormat: @"%@\n",
-		    [self _headerField: @"newsgroups"]]);
+  NSString *rc;
+
+  if (htmlComposition)
+    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"newsgroups"]];
+  else
+    rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"newsgroups"]];
+
+  return rc;
 }
 
 - (BOOL) hasReferences
@@ -140,8 +195,14 @@
 
 - (NSString *) references
 {
-  return ([NSString stringWithFormat: @"%@\n",
-		    [self _headerField: @"references"]]);
+  NSString *rc;
+
+  if (htmlComposition)
+    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"references"]];
+  else
+    rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"references"]];
+
+  return rc;
 }
 
 - (NSString *) messageBody

SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Message original --------
-Sujet: <#subject/>
-Date: <#date/>
-De: <#from/>
-<#hasReplyTo>Répondre à: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>Pour: <#to/>
-<#hasCc>Copie: <#cc/></#hasCc><#hasNewsGroups>Forums de discussion: <#newsgroups/></#hasNewsGroups><#hasReferences>Références: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- Message original --------<#newLine/>
+Sujet: <#subject/><#newLine/>
+Date: <#date/><#newLine/>
+De: <#from/><#newLine/>
+<#hasReplyTo>Répondre à: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>Pour: <#to/><#newLine/>
+<#hasCc>Copie: <#cc/></#hasCc><#hasNewsGroups>Forums de discussion: <#newsgroups/></#hasNewsGroups><#hasReferences>Références: <#references/></#hasReferences><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.html

@@ -1,16 +1,16 @@
-<#replyPlacementOnTop>
-
-</#replyPlacementOnTop><#signaturePlacementOnTop>
-<#signature/>
-</#signaturePlacementOnTop><#outlookMode>-------- Message original --------
-Sujet: <#subject/>
-Date: <#date/>
-De: <#from/>
-<#hasReplyTo>Répondre à: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>Pour: <#to/>
-<#hasCc>Copie: <#cc/></#hasCc><#hasNewsGroups>Forums de discussion: <#newsgroups/></#hasNewsGroups><#hasReferences>Références: <#references/></#hasReferences></#outlookMode>
-<#standardMode>Le <#date/>, <#from/> a écrit:</#standardMode>
-
-<#messageBody/>
-<#replyPlacementOnBottom>
-
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#replyPlacementOnTop><#newLine/>
+<#newLine/>
+</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/>
+</#signaturePlacementOnTop><#outlookMode>-------- Message original --------<#newLine/>
+Sujet: <#subject/><#newLine/>
+Date: <#date/><#newLine/>
+De: <#from/><#newLine/>
+<#hasReplyTo>Répondre à: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>Pour: <#to/><#newLine/>
+<#hasCc>Copie: <#cc/></#hasCc><#hasNewsGroups>Forums de discussion: <#newsgroups/></#hasNewsGroups><#hasReferences>Références: <#references/></#hasReferences></#outlookMode><#newLine/>
+<#standardMode>Le <#date/>, <#from/> a écrit:</#standardMode><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#replyPlacementOnBottom><#newLine/>
+<#newLine/>
+</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>

SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Original-Nachricht --------
-Betreff: <#subject/>
-Datum: <#date/>
-Von: <#from/>
-<#hasReplyTo>Antwort an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/>
-<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- Original-Nachricht --------<#newLine/>
+Betreff: <#subject/><#newLine/>
+Datum: <#date/><#newLine/>
+Von: <#from/><#newLine/>
+<#hasReplyTo>Antwort an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/><#newLine/>
+<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html

@@ -1,16 +1,16 @@
-<#replyPlacementOnTop>
-
-</#replyPlacementOnTop><#signaturePlacementOnTop>
-<#signature/>
-</#signaturePlacementOnTop><#outlookMode>-------- Original-Nachricht --------
-Betreff: <#subject/>
-Datum: <#date/>
-Von: <#from/>
-<#hasReplyTo>Antwort an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/>
-<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences></#outlookMode>
-<#standardMode>Am <#date/>, <#from/> schrieb:</#standardMode>
-
-<#messageBody/>
-<#replyPlacementOnBottom>
-
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#replyPlacementOnTop><#newLine/>
+<#newLine/>
+</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/>
+</#signaturePlacementOnTop><#outlookMode>-------- Original-Nachricht --------<#newLine/>
+Betreff: <#subject/><#newLine/>
+Datum: <#date/><#newLine/>
+Von: <#from/><#newLine/>
+<#hasReplyTo>Antwort an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/><#newLine/>
+<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences></#outlookMode><#newLine/>
+<#standardMode>Am <#date/>, <#from/> schrieb:</#standardMode><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#replyPlacementOnBottom><#newLine/>
+<#newLine/>
+</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>

SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Messaggio originale --------
-Oggetto: <#subject/>
-Data: <#date/>
-Da: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organizzazione: <#organization/></#hasOrganization>A: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Riferimento: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- Messaggio originale --------<#newLine/>
+Oggetto: <#subject/><#newLine/>
+Data: <#date/><#newLine/>
+Da: <#from/><#newLine/>
+<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organizzazione: <#organization/></#hasOrganization>A: <#to/><#newLine/>
+<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Riferimento: <#references/></#hasReferences><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.html

@@ -1,16 +1,16 @@
-<#replyPlacementOnTop>
-
-</#replyPlacementOnTop><#signaturePlacementOnTop>
-<#signature/>
-</#signaturePlacementOnTop><#outlookMode>-------- Messaggio originale --------
-Oggetto: <#subject/>
-Data: <#date/>
-Da: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organizzazione: <#organization/></#hasOrganization>A: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Riferimento: <#references/></#hasReferences></#outlookMode>
-<#standardMode>Il giorno <#date/>, <#from/> ha scritto:</#standardMode>
-
-<#messageBody/>
-<#replyPlacementOnBottom>
-
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#replyPlacementOnTop><#newLine/>
+<#newLine/>
+</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/>
+</#signaturePlacementOnTop><#outlookMode>-------- Messaggio originale --------<#newLine/>
+Oggetto: <#subject/><#newLine/>
+Data: <#date/><#newLine/>
+Da: <#from/><#newLine/>
+<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organizzazione: <#organization/></#hasOrganization>A: <#to/><#newLine/>
+<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Riferimento: <#references/></#hasReferences></#outlookMode><#newLine/>
+<#standardMode>Il giorno <#date/>, <#from/> ha scritto:</#standardMode><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#replyPlacementOnBottom><#newLine/>
+<#newLine/>
+</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>

SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailReply.m

@@ -74,18 +74,21 @@
 
 - (NSString *) messageBody
 {
-  NSString *s;
-  NSUserDefaults *ud;
-
-  ud = [[context activeUser] userDefaults];
+  NSString *s, *msgid;
+  NSRange r;
   
   s = [sourceMail contentForEditing];
 
   if (s)
     {
-      if ([[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"])
+      if (htmlComposition)
         {
-          s = [NSString stringWithFormat: @"<blockquote type=\"cite\">%@</blockquote>", s];
+          msgid = [[sourceMail envelope] messageID];
+          r = NSMakeRange (1, [msgid length] - 2);
+          msgid = [msgid substringWithRange: r];
+          s = [NSString stringWithFormat: 
+               @"<blockquote type=\"cite\" cite=\"%@\">%@</blockquote>", 
+               msgid, s];
         }
       else
         {

SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- 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/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailRussianReply.wo/SOGoMailRussianReply.html

@@ -1,16 +1,16 @@
-<#replyPlacementOnTop>
-
-</#replyPlacementOnTop><#signaturePlacementOnTop>
-<#signature/>
-</#signaturePlacementOnTop><#outlookMode>-------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences></#outlookMode>
-<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
-
-<#messageBody/>
-<#replyPlacementOnBottom>
-
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#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/>

SoObjects/Mailer/SOGoMailRussianReply.wo/SOGoMailRussianReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- 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/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.html

@@ -1,17 +1,17 @@
-<#signaturePlacementOnTop>
-
-
-<#signature/>
-</#signaturePlacementOnTop>
-<#outlookMode>-------- Original Message --------
-Subject: <#subject/>
-Date: <#date/>
-From: <#from/>
-<#hasReplyTo>Reply-To: <#replyTo/></#hasReplyTo><#hasOrganization>Organization: <#organization/></#hasOrganization>To: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences></#outlookMode>
-<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
-
-<#messageBody/>
-
-
-<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#signaturePlacementOnTop><#newLine/>
+<#newLine/>
+<#newLine/>
+<#signature/><#newLine/>
+</#signaturePlacementOnTop><#newLine/>
+<#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/>
+<#newLine/>
+<#newLine/>
+<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>

SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html

@@ -1,13 +1,13 @@
-
-
-
--------- Original Message --------
-Testun: <#subject/>
-Dyddiad: <#date/>
-Oddi wrth: <#from/>
-<#hasReplyTo>Ymateb i: <#replyTo/><#hasOrganization>Sefydliad: <#organization/></#hasOrganization>I: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#newLine/>
+-------- Original Message --------<#newLine/>
+Testun: <#subject/><#newLine/>
+Dyddiad: <#date/><#newLine/>
+Oddi wrth: <#from/><#newLine/>
+<#hasReplyTo>Ymateb i: <#replyTo/><#hasOrganization>Sefydliad: <#organization/></#hasOrganization>I: <#to/><#newLine/>
+<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#newLine/>
+<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod

@@ -13,6 +13,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }

SoObjects/Mailer/SOGoMailWelshReply.wo/SOGoMailWelshReply.html

@@ -1,16 +1,16 @@
-<#replyPlacementOnTop>
-
-</#replyPlacementOnTop><#signaturePlacementOnTop>
-<#signature/>
-</#signaturePlacementOnTop><#outlookMode>-------- Neges Wreiddiol --------
-Testun: <#subject/>
-Dyddiad: <#date/>
-Oddi wrth: <#from/>
-<#hasReplyTo>Ymateb i: <#replyTo/></#hasReplyTo><#hasOrganization>Sefydliad: <#organization/></#hasOrganization>I: <#to/>
-<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences></#outlookMode>
-<#standardMode>Ar <#date/>, <#from/> ysgrifennodd:</#standardMode>
-
-<#messageBody/>
-<#replyPlacementOnBottom>
-
-</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
+<#replyPlacementOnTop><#newLine/>
+<#newLine/>
+</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/>
+</#signaturePlacementOnTop><#outlookMode>-------- Neges Wreiddiol --------<#newLine/>
+Testun: <#subject/><#newLine/>
+Dyddiad: <#date/><#newLine/>
+Oddi wrth: <#from/><#newLine/>
+<#hasReplyTo>Ymateb i: <#replyTo/></#hasReplyTo><#hasOrganization>Sefydliad: <#organization/></#hasOrganization>I: <#to/><#newLine/>
+<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences></#outlookMode><#newLine/>
+<#standardMode>Ar <#date/>, <#from/> ysgrifennodd:</#standardMode><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#replyPlacementOnBottom><#newLine/>
+<#newLine/>
+</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom><#newLine/>

SoObjects/Mailer/SOGoMailWelshReply.wo/SOGoMailWelshReply.wod

@@ -22,6 +22,11 @@ from: WOString {
   escapeHTML = NO;
 }
 
+newLine: WOString {
+  value = newLine;
+  escapeHTML = NO;
+}
+
 hasReplyTo: WOConditional {
   condition = hasReplyTo;
 }