grr

Author: Richard Jones

roundup/mailgw.py

@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.70 2002-05-06 23:40:07 richard Exp $
+$Id: mailgw.py,v 1.71 2002-05-08 02:40:55 richard Exp $
 '''
 
 
@@ -768,7 +768,7 @@ def parseContent(content, keep_citations, keep_body,
         blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
         eol=re.compile(r'[\r\n]+'), 
         signature=re.compile(r'^[>|\s]*[-_]+\s*$'),
-        original_message=re.compile(r'^-----Original Message-----$')):
+        original_message=re.compile(r'^[>|\s]*-----Original Message-----$')):
     ''' The message body is divided into sections by blank lines.
     Sections where the second and all subsequent lines begin with a ">" or "|"
     character are considered "quoting sections". The first line of the first
@@ -834,6 +834,9 @@ def parseContent(content, keep_citations, keep_body,
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.70  2002/05/06 23:40:07  richard
+# hrm
+#
 # Revision 1.69  2002/05/06 23:37:21  richard
 # Tweaking the signature deletion from mail messages.
 # Added nuking of the "-----Original Message-----" crap from Outlook.