Merge branch 'master' of https://github.com/inverse-inc/sogo

NEWS

@@ -12,10 +12,11 @@ New features
 Enhancements
  - we now automatically convert <img src=data...> into file attachments
    using CIDs. This prevents Outlook issues.
- - updated Finnish translation
+ - updated French and Finnish translations
  - XMLHttpRequest.js is now loaded conditionaly (< IE9)
  - format time in attendees invitation window according to the user's locale
  - improved IE11 support
+ - respect signature placement when forwarding a message
 
 Bug fixes
  - don't load 'background' attribute (#2437)
@@ -27,7 +28,7 @@ Enhancements
  - updated CKEditor to version 4.3.0 and added tab module
 
 Bug fixes
- - HTML formatting is now retained when forwarding/replying to a mail using the HTML editor.
+ - HTML formatting is now retained when forwarding/replying to a mail using the HTML editor
  - put the text part before the HTML part when composing mail to fix a display issue with Thunderbird (#2512)
 
 2.1.1a (2013-11-22)

SoObjects/Mailer/SOGoDraftObject.m

@@ -889,7 +889,6 @@ static NSString    *userAgent      = nil;
   NSDictionary *info, *attachment;
   NSString *signature, *nl;
   SOGoUserDefaults *ud;
-  BOOL asInline;
 
   [sourceMail fetchCoreInfos];
   
@@ -907,10 +906,9 @@ static NSString    *userAgent      = nil;
 
   /* attach message */
   ud = [[context activeUser] userDefaults];
-  asInline = [[ud mailMessageForwarding] isEqualToString: @"inline"];
-  if (asInline)
+  if ([[ud mailMessageForwarding] isEqualToString: @"inline"])
     {
-      [self setText: [sourceMail contentForReply]];
+      [self setText: [sourceMail contentForInlineForward]];
       [self _fetchAttachmentsFromMail: sourceMail];
     }
   else
@@ -921,7 +919,7 @@ static NSString    *userAgent      = nil;
       if ([signature length])
         {
           nl = (isHTML ? @"<br/>" : @"\n");
-          [self setText: [NSString stringWithFormat: @"%@-- %@%@", nl, nl, signature]];
+          [self setText: [NSString stringWithFormat: @"%@%@-- %@%@", nl, nl, nl, signature]];
         }
       attachment = [NSDictionary dictionaryWithObjectsAndKeys:
 				   [sourceMail filenameForForward], @"filename",
@@ -933,10 +931,9 @@ static NSString    *userAgent      = nil;
 
   [self storeInfo];
 
-  if (!asInline)
-    // When the user has chosen to forward messages as attachment, immediately save the message
-    // to the IMAP store so the user can eventually view the attached file from the Web interface
-    [self save];
+  // Save the message to the IMAP store so the user can eventually view the attached file(s)
+  // from the Web interface
+  [self save];
 }
 
 /* accessors */

SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- الرسالة الاصلية --------<#newLine/>
 الموضوع: <#subject/><#newLine/>
 التاريخ: <#date/><#newLine/>
@@ -9,5 +10,7 @@
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>مجموعات الأخبار: <#newsgroups/></#hasNewsGroups><#hasReferences>المراجع: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.html

@@ -1,10 +1,16 @@
--------- Original Message --------
-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>
-
-<#messageBody/>
-
-<#signature/>
+<#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/>

SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod

@@ -72,3 +72,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Original Message --------<#newLine/>
 Subject: <#subject/><#newLine/>
 Date: <#date/><#newLine/>
@@ -9,5 +10,7 @@ From: <#from/><#newLine/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.html

@@ -1,10 +1,16 @@
--------- Původní zpráva --------
-Předmět: <#subject/>
-Datum: <#date/>
-Od: <#from/>
-<#hasReplyTo>Odpověď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizace: <#organization/></#hasOrganization>Komu: <#to/>
-<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Diskuzní skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
+-------- Původní zpráva --------<#newLine/>
+Předmět: <#subject/><#newLine/>
+Datum: <#date/><#newLine/>
+Od: <#from/><#newLine/>
+<#hasReplyTo>Odpověď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizace: <#organization/></#hasOrganization>Komu: <#to/><#newLine/>
+<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Diskuzní skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
+<#newLine/>

SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Original Message --------<#newLine/>
 Subject: <#subject/><#newLine/>
 Date: <#date/><#newLine/>
@@ -9,5 +10,7 @@ From: <#from/><#newLine/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Original Message --------<#newLine/>
 Subject: <#subject/><#newLine/>
 Date: <#date/><#newLine/>
@@ -9,5 +10,7 @@ From: <#from/><#newLine/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Original Message --------<#newLine/>
 Subject: <#subject/><#newLine/>
 Date: <#date/><#newLine/>
@@ -9,5 +10,7 @@ From: <#from/><#newLine/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod

@@ -77,3 +77,21 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Alkuperäinen viesti --------<#newLine/>
 Aihe: <#subject/><#newLine/>
 Pvm: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Keneltä: <#from/><#newLine/>
 <#hasCc>Kopio: <#cc/></#hasCc><#hasNewsGroups>Uutisryhmät: <#newsgroups/></#hasNewsGroups><#hasReferences>Viitteet: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailForward.h

@@ -31,9 +31,12 @@
   NSString *field;
   NSString *currentValue;
   BOOL htmlComposition;
+  NSString *signaturePlacement;
 }
 
 - (void) setSourceMail: (SOGoMailObject *) newSourceMail;
+- (void) setSignaturePlacement: (NSString *) newPlacement;
+- (BOOL) signaturePlacementOnTop;
 
 @end
 

SoObjects/Mailer/SOGoMailForward.m

@@ -56,6 +56,16 @@
   [super dealloc];
 }
 
+- (void) setSignaturePlacement: (NSString *) newPlacement
+{
+  signaturePlacement = newPlacement;
+}
+
+- (BOOL) signaturePlacementOnTop
+{
+  return [signaturePlacement isEqual: @"above"];
+}
+
 - (void) setSourceMail: (SOGoMailObject *) newSourceMail
 {
   ASSIGN (sourceMail, newSourceMail);

SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Message original --------<#newLine/>
 Sujet: <#subject/><#newLine/>
 Date: <#date/><#newLine/>
@@ -9,5 +10,7 @@ De: <#from/><#newLine/>
 <#hasCc>Copie: <#cc/></#hasCc><#hasNewsGroups>Forums de discussion: <#newsgroups/></#hasNewsGroups><#hasReferences>Références: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Original-Nachricht --------<#newLine/>
 Betreff: <#subject/><#newLine/>
 Datum: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Von: <#from/><#newLine/>
 <#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Eredeti üzenet --------<#newLine/>
 Tárgy: <#subject/><#newLine/>
 Dátum: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Feladó: <#from/><#newLine/>
 <#hasCc>Másolat: <#cc/></#hasCc><#hasNewsGroups>Hírcsoportok: <#newsgroups/></#hasNewsGroups><#hasReferences>Hivatkozások: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Upprunalegt bréf --------<#newLine/>
 Efni: <#subject/><#newLine/>
 Dags: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Frá: <#from/><#newLine/>
 <#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Tilvísanir: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Messaggio originale --------<#newLine/>
 Oggetto: <#subject/><#newLine/>
 Data: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Da: <#from/><#newLine/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Riferimento: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Originalpost --------<#newLine/>
 Emne: <#subject/><#newLine/>
 Dato: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Fra: <#from/><#newLine/>
 <#hasCc>Kopi: <#cc/></#hasCc><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/></#hasNewsGroups><#hasReferences>Referanser: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Originalpost --------<#newLine/>
 Emne: <#subject/><#newLine/>
 Dato: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Fra: <#from/><#newLine/>
 <#hasCc>Kopi: <#cc/></#hasCc><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/></#hasNewsGroups><#hasReferences>Referanser: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailObject+Draft.m

@@ -256,16 +256,17 @@
 //
 - (NSString *) contentForInlineForward
 {
-  SOGoUserDefaults *ud;
+  SOGoUserDefaults *userDefaults;
   NSString *pageName;
   SOGoMailForward *page;
 
-  ud = [[context activeUser] userDefaults];
+  userDefaults = [[context activeUser] userDefaults];
   pageName = [NSString stringWithFormat: @"SOGoMail%@Forward",
-		       [ud language]];
+		       [userDefaults language]];
   page = [[WOApplication application] pageWithName: pageName
 				      inContext: context];
   [page setSourceMail: self];
+  [page setSignaturePlacement: [userDefaults mailSignaturePlacement]];
 
   return [[page generateResponse] contentAsString];
 }

SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Oryginalna wiadomość --------<#newLine/>
 Temat: <#subject/><#newLine/>
 Data: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Od: <#from/><#newLine/>
 <#hasCc>DW: <#cc/></#hasCc><#hasNewsGroups>Grupy dyskusyjne: <#newsgroups/></#hasNewsGroups><#hasReferences>Odniesienia: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailReply.h

@@ -29,15 +29,12 @@
 {
   BOOL outlookMode;
   NSString *replyPlacement;
-  NSString *signaturePlacement;
 }
 
 - (void) setOutlookMode: (BOOL) newOutlookMode;
 - (BOOL) outlookMode;
 - (void) setReplyPlacement: (NSString *) newPlacement;
 - (BOOL) replyPlacementOnTop;
-- (void) setSignaturePlacement: (NSString *) newPlacement;
-- (BOOL) signaturePlacementOnTop;
 - (NSString *) messageBody;
 
 @end

SoObjects/Mailer/SOGoMailReply.m

@@ -60,16 +60,6 @@
   return [replyPlacement isEqual: @"above"];
 }
 
-- (void) setSignaturePlacement: (NSString *) newPlacement
-{
-  signaturePlacement = newPlacement;
-}
-
-- (BOOL) signaturePlacementOnTop
-{
-  return [signaturePlacement isEqual: @"above"];
-}
-
 - (NSString *) messageBody
 {
   NSString *s, *msgid;

SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Original Message --------<#newLine/>
 Subject: <#subject/><#newLine/>
 Date: <#date/><#newLine/>
@@ -9,5 +10,7 @@ From: <#from/><#newLine/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.html

@@ -1,10 +1,16 @@
--------- Pôvodná správa --------
-Predmet: <#subject/>
-Dátum: <#date/>
-Od: <#from/>
-<#hasReplyTo>Odpoveď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizácia: <#organization/></#hasOrganization>Komu: <#to/>
-<#hasCc>Kópia: <#cc/></#hasCc><#hasNewsGroups>Diskusné skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences>
-
-<#messageBody/>
-
-<#signature/>
+<#newLine/>
+<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
+-------- Pôvodná správa --------<#newLine/>
+Predmet: <#subject/><#newLine/>
+Dátum: <#date/><#newLine/>
+Od: <#from/><#newLine/>
+<#hasReplyTo>Odpoveď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizácia: <#organization/></#hasOrganization>Komu: <#to/><#newLine/>
+<#hasCc>Kópia: <#cc/></#hasCc><#hasNewsGroups>Diskusné skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences><#newLine/>
+<#newLine/>
+<#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
+<#newLine/>

SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Mensaje Original --------<#newLine/>
 Asunto: <#subject/><#newLine/>
 Fecha: <#date/><#newLine/>
@@ -9,5 +10,7 @@ De: <#from/><#newLine/>
 <#hasCc>Cc: <#cc/></#hasCc><#hasNewsGroups>Grupo Noticias: <#newsgroups/></#hasNewsGroups><#hasReferences>Referencias: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Mensaje Original --------<#newLine/>
 Asunto: <#subject/><#newLine/>
 Fecha: <#date/><#newLine/>
@@ -9,5 +10,7 @@ De: <#from/><#newLine/>
 <#hasCc>Cc: <#cc/></#hasCc><#hasNewsGroups>Grupo Noticias: <#newsgroups/></#hasNewsGroups><#hasReferences>Referencias: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Originalmeddelande --------<#newLine/>
 Ämne: <#subject/><#newLine/>
 Datum: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Från: <#from/><#newLine/>
 <#hasCc>Kopia: <#cc/></#hasCc><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenser: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Початкове повідомлення --------<#newLine/>
 Тема: <#subject/><#newLine/>
 Дата: <#date/><#newLine/>
@@ -9,5 +10,7 @@
 <#hasCc>Копія: <#cc/></#hasCc><#hasNewsGroups>Групи новин: <#newsgroups/></#hasNewsGroups><#hasReferences>Посилання: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html

@@ -1,6 +1,7 @@
 <#newLine/>
 <#newLine/>
-<#newLine/>
+<#signaturePlacementOnTop><#newLine/>
+<#signature/><#newLine/></#signaturePlacementOnTop>
 -------- Original Message --------<#newLine/>
 Testun: <#subject/><#newLine/>
 Dyddiad: <#date/><#newLine/>
@@ -9,5 +10,7 @@ Oddi wrth: <#from/><#newLine/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
+<#signaturePlacementOnBottom><#newLine/>
+<#newLine/>
+<#signature/></#signaturePlacementOnBottom>
 <#newLine/>
-<#signature/><#newLine/>

SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod

@@ -77,3 +77,12 @@ signature: WOString {
   value = signature;
   escapeHTML = NO;
 }
+
+signaturePlacementOnTop: WOConditional {
+  condition = signaturePlacementOnTop;
+}
+
+signaturePlacementOnBottom: WOConditional {
+  condition = signaturePlacementOnTop;
+  negate = YES;
+}

UI/Common/UIxPageFrame.m

@@ -113,8 +113,7 @@
 
 - (NSString *) doctype
 {
-  return (@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-          @"<!DOCTYPE html"
+  return (@"<!DOCTYPE html"
           @" PUBLIC \"-//W3C//DTD XHTML 1.1//EN\""
           @" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">");
 }

UI/MailerUI/English.lproj/Localizable.strings

@@ -102,6 +102,7 @@
 "Attach Web Page..." = "Attach Web Page...";
 "file" = "file";
 "files" = "files";
+"Save all" = "Save all";
 
 "to"            = "To";
 "cc"            = "Cc";

UI/MailerUI/French.lproj/Localizable.strings

@@ -102,6 +102,7 @@
 "Attach Web Page..." = "Joindre une page Web...";
 "file" = "fichier";
 "files" = "fichiers";
+"Save all" = "Tout sauvegarder";
 
 "to"            = "Pour";
 "cc"            = "Copie à";

UI/WebServerResources/MailerUI.js

@@ -379,7 +379,7 @@ function onDocumentKeydown(event) {
             }
         }
 	if (keyCode == Event.KEY_DELETE ||
-            keyCode == Event.KEY_BACKSPACE && isMac()) {
+            keyCode == Event.KEY_BACKSPACE) {
             deleteSelectedMessages();
             Event.stop(event);
         }
@@ -1988,10 +1988,7 @@ function initMailer(event) {
         initMailboxTree();
         initMessageCheckTimer();
 
-        if (Prototype.Browser.Gecko)
-            Event.observe(document, "keypress", onDocumentKeydown); // for FF2
-        else
-            Event.observe(document, "keydown", onDocumentKeydown);
+        Event.observe(document, "keydown", onDocumentKeydown);
 
         /* Perform an expunge when leaving the webmail */
 //        if (isSafari()) {