--- /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 1A4CE431E82\r
+ for <notmuch@notmuchmail.org>; Sat, 16 Nov 2013 00:05:37 -0800 (PST)\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 KE8OjEhVxGhX for <notmuch@notmuchmail.org>;\r
+ Sat, 16 Nov 2013 00:05:29 -0800 (PST)\r
+Received: from mail-we0-f176.google.com (mail-we0-f176.google.com\r
+ [74.125.82.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 5A2A6431E64\r
+ for <notmuch@notmuchmail.org>; Sat, 16 Nov 2013 00:05:29 -0800 (PST)\r
+Received: by mail-we0-f176.google.com with SMTP id w62so4361723wes.21\r
+ for <notmuch@notmuchmail.org>; Sat, 16 Nov 2013 00:05:26 -0800 (PST)\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=RO6XgD3/AJDm0mILG0+j50kTgKgOVvep8DnbjF08OQE=;\r
+ b=UNEDbL5wUvXXnbJI+aeM5Szt4zW4wnIoH9+3STcsm90QnMvpeL92qo2cwB4fPiUY1D\r
+ V/8bLVsd58h9p4VT0nJhctS1kfJEnkQ4YGXQ9hmqC1pvCYTdTPQuvIJO3hKUuVF8b4DL\r
+ rv31yDX/stZFamLVmURpsXDjzHIuhh6Jomax0TQ2yB4A34qQKM9ixNkCZj+4Z2AdcFrt\r
+ rWtK/K+ucApSybm4qIZjsLnoxcKGssqanEn2SwUPOk1lVR2GTSmjOHZKf+OOuWUz91oC\r
+ c+M/V2/bfoM80BNpx0nSr8A/1FNHwaA3+9VfSk39lGg53nhphIlLw1WIIhb2C3PqTFoq\r
+ KJaQ==\r
+X-Received: by 10.180.205.194 with SMTP id li2mr9836366wic.57.1384589125402;\r
+ Sat, 16 Nov 2013 00:05:25 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id e1sm2737376wij.6.2013.11.16.00.05.24\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 16 Nov 2013 00:05:24 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] News for tree-view\r
+Date: Sat, 16 Nov 2013 08:05:16 +0000\r
+Message-Id: <1384589116-23155-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <m2habg0y0f.fsf@guru.guru-group.fi>\r
+References: <m2habg0y0f.fsf@guru.guru-group.fi>\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: Sat, 16 Nov 2013 08:05:37 -0000\r
+\r
+---\r
+Update following Tomi's suggestions.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+ NEWS | 32 ++++++++++++++++++++++++++++++++\r
+ 1 files changed, 32 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index 9434af9..d0d5300 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -33,6 +33,38 @@ Improved `notmuch new` performance for unchanged folders\r
+ Emacs Interface\r
+ ---------------\r
+ \r
++`notmuch-tree` (formerly `notmuch-pick`) has been added to mainline\r
++\r
++ `notmuch-tree` is a threaded message view for the emacs\r
++ interface. Each message is one line in the results and the thread\r
++ structure is shown using UTF-8 box drawing characters (similar to\r
++ Mutt's threaded view). It comes between search and show in terms of\r
++ amount of output and can be useful for viewing both single threads\r
++ and multiple threads.\r
++\r
++ Using `notmuch-tree`\r
++\r
++ The main key entries to notmuch tree are\r
++\r
++ 'z' enter a query to view using notmuch tree (works in hello,\r
++ search, show and tree mode itself)\r
++\r
++ 'Z' view the current query in tree notmuch tree (works from search\r
++ and show)\r
++\r
++ Once in tree mode, keybindings are mostly in line with the rest of\r
++ notmuch and are all viewable with '?' as usual.\r
++\r
++ Customising `notmuch-tree`\r
++\r
++ `notmuch-tree` has several customisation variables. The most\r
++ significant is the first notmuch-tree-show-out which determines the\r
++ behaviour when selecting a message (with RET) in tree view. By\r
++ default tree view uses a split window showing the single message in\r
++ the bottom pane. However, if this option is set then it views the\r
++ whole thread in the complete window jumping to the selected message\r
++ in the thread. In either case command-prefix selects the other option.\r
++\r
+ Tagging threads in search is now race-free\r
+ \r
+ Previously, adding or removing a tag from a thread in a search\r
+-- \r
+1.7.9.1\r
+\r