aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-tools.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a6e73118d1..2221c7c9b0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-15 Jason Leach <jleach@ximian.com>
+
+ * mail-tools.c (mail_tool_quote_message): Stop building the quote
+ after a sigdash, hence, omitting the signature from a
+ reply/forward. Bug #5529.
+
2001-08-15 Anna Marie Dirks <anna@ximian.com>
* mail-callbacks.c (expunge-folders): Re-added, at Ettore's
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 92b9768137..35e64db093 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -389,6 +389,8 @@ mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...)
len = strcspn (s, "\n");
if (len == 0 && !*s)
break;
+ if (!strncmp ("-- \n", s, 4) || !strncmp ("--\n", s, 3))
+ break;
sprintf (d, "> %.*s\n", len, s);
s += len;
if (!*s++)