--- /dev/null
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 34180429E29\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Mar 2015 06:26:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+ tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=unavailable\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 gecWo3ALnXvz for <notmuch@notmuchmail.org>;\r
+ Tue, 24 Mar 2015 06:26:39 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+ [87.98.215.224])\r
+ (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 3ABAE429E45\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Mar 2015 06:26:23 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+ 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1YaOpy-0000sx-41; Tue, 24 Mar 2015 13:25:42 +0000\r
+Received: (nullmailer pid 2686 invoked by uid 1000); Tue, 24 Mar 2015\r
+ 13:24:25 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: [Patch v5 6/8] lib: add private function to extract the database for\r
+ a message.\r
+Date: Tue, 24 Mar 2015 09:24:09 -0400\r
+Message-Id: <1427203451-1540-7-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1427203451-1540-1-git-send-email-david@tethera.net>\r
+References: <1426352554-4383-10-git-send-email-david@tethera.net>\r
+ <1427203451-1540-1-git-send-email-david@tethera.net>\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, 24 Mar 2015 13:26:40 -0000\r
+\r
+This is needed by logging in functions outside message.cc that take\r
+only a notmuch_message_t object.\r
+---\r
+ lib/message.cc | 6 ++++++\r
+ lib/notmuch-private.h | 2 ++\r
+ 2 files changed, 8 insertions(+)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 956a70a..b84e5e1 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -1626,3 +1626,9 @@ notmuch_message_destroy (notmuch_message_t *message)\r
+ {\r
+ talloc_free (message);\r
+ }\r
++\r
++notmuch_database_t *\r
++_notmuch_message_database (notmuch_message_t *message)\r
++{\r
++ return message->notmuch;\r
++}\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 7cb6fd4..dc58a2f 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -472,6 +472,8 @@ _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,\r
+ void\r
+ _notmuch_message_add_reply (notmuch_message_t *message,\r
+ notmuch_message_t *reply);\r
++notmuch_database_t *\r
++_notmuch_message_database (notmuch_message_t *message);\r
+ \r
+ /* sha1.c */\r
+ \r
+-- \r
+2.1.4\r
+\r