--- /dev/null
+Return-Path: <markwalters1009@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 05DB3431FD4\r
+ for <notmuch@notmuchmail.org>; Tue, 3 Sep 2013 07:05:22 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ 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 s9bPsmN-op2q for <notmuch@notmuchmail.org>;\r
+ Tue, 3 Sep 2013 07:05:15 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+ [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 96FBF431FD5\r
+ for <notmuch@notmuchmail.org>; Tue, 3 Sep 2013 07:05:12 -0700 (PDT)\r
+Received: by mail-we0-f181.google.com with SMTP id p60so386428wes.26\r
+ for <notmuch@notmuchmail.org>; Tue, 03 Sep 2013 07:05:11 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=NfiV28/u1DfJ15UQIIZ3BSSY7NSNcYIkI5bAHlRlYXQ=;\r
+ b=BbGWhfsOTf5vfQh2k+B1F7gMo6mx3Qlxlx1qpNkahvOlDgcd0+meffMW9shVlZegNr\r
+ x+hz45ga2aSt+1Qx6Q10wZ5WR0Oxtv8lcLZ/DntLpA2gekRRHWK2OPtaKdvXxcw2frPm\r
+ o9Kp0+NQ9z2D/3GeD0Jj7Y1IGIHupAr97IkRQfjhuD4u11Zofc01sInjHDv5VejVmAFe\r
+ Qu1pjRYH4Q5UTvg/AtfizP8J+xbkIW0HZdKo8mMnQn08Br2oP3RRLi5PAMH53k9EHcJK\r
+ 33Omo5GmSAjW02kUb/CRGhCX3pFQJ/F4tJP5WqRycjIsGENkuhuZl364stA+sU50sank\r
+ aH+w==\r
+X-Received: by 10.180.39.212 with SMTP id r20mr18394207wik.13.1378217111495;\r
+ Tue, 03 Sep 2013 07:05:11 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id bh5sm25546421wib.7.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Tue, 03 Sep 2013 07:05:11 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] contrib: pick: test: stash message id\r
+Date: Tue, 3 Sep 2013 15:04:59 +0100\r
+Message-Id: <1378217100-27533-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1378217100-27533-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1378217100-27533-1-git-send-email-markwalters1009@gmail.com>\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: Tue, 03 Sep 2013 14:05:22 -0000\r
+\r
+This is important to test as lots of subsequent tests will fail if this fails.\r
+---\r
+ contrib/notmuch-pick/test/emacs-pick | 8 ++++++++\r
+ 1 files changed, 8 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick\r
+index 91edcac..6834998 100755\r
+--- a/contrib/notmuch-pick/test/emacs-pick\r
++++ b/contrib/notmuch-pick/test/emacs-pick\r
+@@ -159,4 +159,12 @@ test_emacs '(notmuch-hello)\r
+ cp OUTPUT /tmp/mjwout\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-show-window\r
+ \r
++test_begin_subtest "Stash id"\r
++output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
++ (require (quote notmuch-pick))\r
++ (notmuch-pick "id:1258498485-sup-142@elly")\r
++ (notmuch-test-wait)\r
++ (notmuch-show-stash-message-id)')\r
++test_expect_equal "$output" "\"Stashed: id:1258498485-sup-142@elly\""\r
++\r
+ test_done\r
+-- \r
+1.7.9.1\r
+\r