--- /dev/null
+Return-Path: <dmitry.kurochkin@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id BE089431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Feb 2012 04:46:00 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id O5nZU+U7Qerw for <notmuch@notmuchmail.org>;\r
+ Mon, 20 Feb 2012 04:45:56 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+ [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 86952431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Feb 2012 04:45:56 -0800 (PST)\r
+Received: by bkcit16 with SMTP id it16so5139342bkc.26\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Feb 2012 04:45:55 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of dmitry.kurochkin@gmail.com\r
+ designates 10.204.143.145 as permitted sender)\r
+ client-ip=10.204.143.145; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+ dmitry.kurochkin@gmail.com designates 10.204.143.145 as\r
+ permitted sender) smtp.mail=dmitry.kurochkin@gmail.com;\r
+ dkim=pass header.i=dmitry.kurochkin@gmail.com\r
+Received: from mr.google.com ([10.204.143.145])\r
+ by 10.204.143.145 with SMTP id v17mr11267767bku.20.1329741955168\r
+ (num_hops = 1); Mon, 20 Feb 2012 04:45:55 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version:content-type;\r
+ bh=zcONjoXh7+YzMapg1a0gbteCyQbur024a0eAAfCNiyc=;\r
+ b=arcyeCF6EaSzP0T63F3JwKmAD4So/8W68EL4IBqarQ9eaWV+DcN0wzkRm0B5sSLvGY\r
+ o0pgEMlw8AgkrDJMtt1L8nWoSEaom9JIshkgyGyHeENI/vHA5J83LrVtojLLKpTMOHwF\r
+ LYr6orW0oaUjo+6ER3GcNDPQCaXqAwyg92R+Y=\r
+Received: by 10.204.143.145 with SMTP id v17mr9095242bku.20.1329741955083;\r
+ Mon, 20 Feb 2012 04:45:55 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+ by mx.google.com with ESMTPS id fw2sm2933497bkc.13.2012.02.20.04.45.53\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 20 Feb 2012 04:45:54 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: Pieter Praet <pieter@praet.org>, Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH v2 2/4] test: emacs: new test "notmuch-search: replying to\r
+ a thread (sending)"\r
+In-Reply-To: <1329683908-5435-3-git-send-email-pieter@praet.org>\r
+References: <1310313335-4159-1-git-send-email-pieter@praet.org>\r
+ <1329683908-5435-1-git-send-email-pieter@praet.org>\r
+ <1329683908-5435-3-git-send-email-pieter@praet.org>\r
+User-Agent: Notmuch/0.11.1+188~ga5674c2 (http://notmuchmail.org) Emacs/23.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 20 Feb 2012 16:44:32 +0400\r
+Message-ID: <87fwe5lln3.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 20 Feb 2012 12:46:00 -0000\r
+\r
+On Sun, 19 Feb 2012 21:38:26 +0100, Pieter Praet <pieter@praet.org> wrote:\r
+> As pointed out in the previous commit, the test for replying from\r
+> within Emacs didn't actually submit the reply. This one does.\r
+> ---\r
+> test/emacs | 41 +++++++++++++++++++++++++++++++++++++++++\r
+> 1 files changed, 41 insertions(+), 0 deletions(-)\r
+> \r
+> diff --git a/test/emacs b/test/emacs\r
+> index 308d749..0f4f42b 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -273,6 +273,47 @@ On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> w\r
+> EOF\r
+> test_expect_equal_file OUTPUT EXPECTED\r
+> \r
+> +test_begin_subtest "notmuch-search: replying to a thread (sending)"\r
+> +$TEST_DIRECTORY/smtp-dummy sent_message &\r
+> +smtp_dummy_pid=$!\r
+> +test_emacs \\r
+> +'(let ((message-send-mail-function '\''message-smtpmail-send-it)\r
+> + (smtpmail-smtp-server "localhost")\r
+> + (smtpmail-smtp-service "25025"))\r
+> + (notmuch-search "subject:\"testing message sent via SMTP\"")\r
+> + (notmuch-test-wait)\r
+> + (notmuch-search-reply-to-thread)\r
+> + (end-of-buffer)\r
+> + (newline)\r
+> + (insert "Reply to a message via Emacs with fake SMTP")\r
+> + (message-send-and-exit))' >/dev/null 2>&1\r
+> +wait ${smtp_dummy_pid}\r
+> +notmuch new >/dev/null\r
+> +sed \\r
+> + -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \\r
+> + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \\r
+> + -e s',^In-Reply-To: <.*>$,In-Reply-To: <XXX>,' \\r
+> + -e s',^References: <.*>$,References: <XXX>,' \\r
+> + -e s',^Date: .*$,Date: Fri\, 29 Mar 1974 10:05:00 -0000,' < sent_message >OUTPUT\r
+\r
+This sed command is a (partial) copy past from "Sending a message via\r
+(fake) SMTP" test. I suggest adding notmuch_sent_message_sanitize\r
+function which would replace common headers with XXX.\r
+\r
+Replace Date with XXX for Date for consistency with other headers,\r
+AFAICT a valid date value is not needed here.\r
+\r
+Regards,\r
+ Dmitry\r
+\r
+> +cat <<EOF >EXPECTED\r
+> +From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+> +To: user@example.com\r
+> +Subject: Re: Testing message sent via SMTP\r
+> +In-Reply-To: <XXX>\r
+> +References: <XXX>\r
+> +User-Agent: Notmuch/XXX Emacs/XXX\r
+> +Date: Fri, 29 Mar 1974 10:05:00 -0000\r
+> +Message-ID: <XXX>\r
+> +MIME-Version: 1.0\r
+> +Content-Type: text/plain; charset=us-ascii\r
+> +\r
+> +On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
+> +> This is a test that messages are sent via SMTP\r
+> +\r
+> +Reply to a message via Emacs with fake SMTP\r
+> +EOF\r
+> +test_expect_equal_file OUTPUT EXPECTED\r
+> +\r
+> test_begin_subtest "Quote MML tags in reply"\r
+> message_id='test-emacs-mml-quoting@message.id'\r
+> add_message [id]="$message_id" \\r
+> -- \r
+> 1.7.8.1\r
+> \r