diff --git a/test/notmuch-test b/test/notmuch-test
index 0488b67a..33218d24 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -395,6 +395,25 @@ References:  <${gen_msg_id}>
 On Tue, 05 Jan 2010 15:43:56 -0800, Sender <sender@example.com> wrote:
 > support for reply-to"
 
+printf " Un-munging Reply-To...\t\t"
+generate_message '[from]="Sender <sender@example.com>"' \
+                 '[to]="Some List <list@example.com>"' \
+                 [subject]=notmuch-reply-test \
+                 '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \
+                 '[body]="Un-munging Reply-To"' \
+                 '[reply-to]="Evil Munging List <list@example.com>"'
+
+$NOTMUCH new > /dev/null
+execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+Subject: Re: notmuch-reply-test
+To: Sender <sender@example.com>, Some List <list@example.com>
+Bcc: test_suite@notmuchmail.org
+In-Reply-To: <${gen_msg_id}>
+References:  <${gen_msg_id}>
+
+On Tue, 05 Jan 2010 15:43:56 -0800, Sender <sender@example.com> wrote:
+> Un-munging Reply-To"
+
 cat <<EOF
 Notmuch test suite complete.