Looking at _notmuch_message_create_for_message_id, the first thing it does is call notmuch_database_find_message, but the returned 'message' is never used. I haven't tried, but I suspect this call could just be removed. -- keith.packard@intel.com