see changelog

Monotone-Parent: 1011e8e7cab7e718b62aa03f637fa6a37349d95c
Monotone-Revision: 06aa9d65ffbfa422bd62686e09571834da68af2f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2007-11-25T17:26:56
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailReply.m

@@ -70,7 +70,21 @@
 
 - (NSString *) messageBody
 {
-  return [[sourceMail contentForEditing] stringByApplyingMailQuoting];
+  NSString *s;
+  
+  s = [sourceMail contentForEditing];
+
+  if (s)
+    {
+      NSRange r;
+
+      r = [s rangeOfString: @"\n-- \n"  options: NSBackwardsSearch];
+
+      if (r.length)
+	s = [s substringToIndex: r.location];
+    }
+
+  return [s stringByApplyingMailQuoting];
 }
 
 - (NSString *) signature
@@ -79,7 +93,7 @@
 
   signature = [[context activeUser] signature];
   if ([signature length])
-    mailSignature = [NSString stringWithFormat: @"--\r\n%@", signature];
+    mailSignature = [NSString stringWithFormat: @"-- \n%@", signature];
   else
     mailSignature = @"";