diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 5197bf297d..3eea18e981 100644 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -9,7 +9,7 @@ from frappe.utils import validate_email_add, cint, get_datetime, DATE_FORMAT from frappe.email.smtp import SMTPServer from frappe.email.receive import POP3Server, Email from poplib import error_proto -import markdown2 +import markdown2, re from dateutil.relativedelta import relativedelta from datetime import datetime, timedelta @@ -188,9 +188,11 @@ class EmailAccount(Document): # if sent by same sender with same subject, # append it to old coversation + subject = re.sub("Re[^:]*:\s*", "", email.subject) + parent = frappe.db.get_all(self.append_to, filters={ sender_field: email.from_email, - subject_field: ("like", "%{0}%".format(email.subject)), + subject_field: ("like", "%{0}%".format(subject)), "creation": (">", (get_datetime() - relativedelta(days=10)).strftime(DATE_FORMAT)) }, fields="name") diff --git a/frappe/email/doctype/email_account/test_mails/reply-2.raw b/frappe/email/doctype/email_account/test_mails/reply-2.raw index 6a2e27fea5..9c8b75db0c 100644 --- a/frappe/email/doctype/email_account/test_mails/reply-2.raw +++ b/frappe/email/doctype/email_account/test_mails/reply-2.raw @@ -8,7 +8,7 @@ From: Rushabh Mehta X-Google-Original-From: Rushabh Mehta Content-Type: multipart/alternative; boundary="Apple-Mail=_C996D08F-7A29-4DA2-99B3-17133FA73040" Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) -Subject: weird subject +Subject: weird subject ddwdf23r2 Date: Tue, 16 Sep 2014 12:17:58 +0530 References: <54A4EFFA-AD17-456A-9851-9715574DF0C9@gmail.com> To: Rushabh Mehta diff --git a/frappe/email/doctype/email_account/test_mails/reply-3.raw b/frappe/email/doctype/email_account/test_mails/reply-3.raw index fa1b2bbc5c..a6db5c2838 100644 --- a/frappe/email/doctype/email_account/test_mails/reply-3.raw +++ b/frappe/email/doctype/email_account/test_mails/reply-3.raw @@ -8,7 +8,7 @@ From: Rushabh Mehta X-Google-Original-From: Rushabh Mehta Content-Type: multipart/alternative; boundary="Apple-Mail=_C996D08F-7A29-4DA2-99B3-17133FA73040" Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) -Subject: Re: weird subject +Subject: Re: weird subject ddwdf23r2 Date: Tue, 16 Sep 2014 12:17:58 +0530 References: <54A4EFFA-AD17-456A-9851-9715574DF0C9@gmail.com> To: Rushabh Mehta