Merge branch 'release'

diff --combined lib/add-message.cc
index d4a00b175392710579f7d437d4782cb340ac8a4b,d6e5e73d35f4b4c3183df5642ac251c95ad48641..b16748fda20ebf4128f4e8fd78f4a66f9c9a83c2
--- 1/lib/add-message.cc
--- 2/lib/add-message.cc
+++ b/lib/add-message.cc
@@@ -40,14 -40,17 +40,14 @@@ parse_references (void *ctx
  static const char *
  _notmuch_database_generate_thread_id (notmuch_database_t *notmuch)
  {
 -    /* 16 bytes (+ terminator) for hexadecimal representation of
 -     * a 64-bit integer. */
 -    static char thread_id[17];
  
      notmuch->last_thread_id++;
  
 -    sprintf (thread_id, "%016" PRIx64, notmuch->last_thread_id);
 +    sprintf (notmuch->thread_id_str, "%016" PRIx64, notmuch->last_thread_id);
  
 -    notmuch->writable_xapian_db->set_metadata ("last_thread_id", thread_id);
 +    notmuch->writable_xapian_db->set_metadata ("last_thread_id", notmuch->thread_id_str);
  
 -    return thread_id;
 +    return notmuch->thread_id_str;
  }
  
  static char *
@@@ -404,14 -407,17 +404,17 @@@ static notmuch_status_
  _notmuch_database_link_message (notmuch_database_t *notmuch,
                                notmuch_message_t *message,
                                notmuch_message_file_t *message_file,
-                               bool is_ghost)
+                               bool is_ghost,
+                               bool is_new)
  {
      void *local = talloc_new (NULL);
      notmuch_status_t status;
      const char *thread_id = NULL;
  
      /* Check if the message already had a thread ID */
-     if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) {
+     if (! is_new) {
+       thread_id = notmuch_message_get_thread_id (message);
+     } else if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) {
        if (is_ghost)
            thread_id = notmuch_message_get_thread_id (message);
      } else {
@@@ -538,7 -544,7 +541,7 @@@ notmuch_database_index_file (notmuch_da
        }
  
        ret = _notmuch_database_link_message (notmuch, message,
-                                             message_file, is_ghost);
+                                             message_file, is_ghost, is_new);
        if (ret)
            goto DONE;
  

diff --combined test/T357-index-decryption.sh
index f5644d7eb04085301ef7f71a517b76ea109defa8,1951ef783a36bf0d3d17cfd4d82420d207574b48..0d30e566ec97fa55b9a60c418c76b70fab3bcef2
--- 1/test/T357-index-decryption.sh
--- 2/test/T357-index-decryption.sh
+++ b/test/T357-index-decryption.sh
@@@ -4,11 -4,9 +4,11 @@@
  
  test_description='indexing decrypted mail'
  . $(dirname "$0")/test-lib.sh || exit 1
 +. $(dirname "$0")/test-lib-emacs.sh || exit 1
  
  ##################################################
  
 +test_require_emacs
  add_gnupg_home
  
  # create a test encrypted message
@@@ -114,12 -112,10 +114,10 @@@ test_expect_equal 
      "$expected"
  
  # try inserting it with decryption, should appear as a single copy
- # (note: i think thread id skips 4 because of duplicate message-id
- # insertion, above)
  test_begin_subtest "message cleartext is present with insert --decrypt=true"
  notmuch insert --folder=sent --decrypt=true <<<"$contents"
- output=$(notmuch search wumpus)
- expected='thread:0000000000000005   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)'
+ output=$(notmuch search wumpus | notmuch_search_sanitize)
+ expected='thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)'
  test_expect_equal \
      "$output" \
      "$expected"
@@@ -129,9 -125,9 +127,9 @@@
  test_begin_subtest 'tagging all messages'
  test_expect_success 'notmuch tag +blarney "encrypted message"'
  test_begin_subtest "verify that tags have not changed"
- output=$(notmuch search tag:blarney)
- expected='thread:0000000000000001   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox)
- thread:0000000000000005   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)'
+ output=$(notmuch search tag:blarney | notmuch_search_sanitize)
+ expected='thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox)
+ thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)'
  test_expect_equal \
      "$output" \
      "$expected"
@@@ -140,14 -136,14 +138,14 @@@
  test_begin_subtest 'reindex old messages'
  test_expect_success 'notmuch reindex --decrypt=true tag:encrypted and not property:index.decryption=success'
  test_begin_subtest "reindexed encrypted message, including cleartext"
- output=$(notmuch search wumpus)
+ output=$(notmuch search wumpus | notmuch_search_sanitize)
  test_expect_equal \
      "$output" \
      "$expected"
  
  # and the same search, but by property ($expected is untouched):
  test_begin_subtest "emacs search by property for both messages"
- output=$(notmuch search property:index.decryption=success)
+ output=$(notmuch search property:index.decryption=success | notmuch_search_sanitize)
  test_expect_equal \
      "$output" \
      "$expected"
@@@ -156,7 -152,7 +154,7 @@@
  test_begin_subtest 'reindex in auto mode'
  test_expect_success 'notmuch reindex tag:encrypted and property:index.decryption=success'
  test_begin_subtest "reindexed encrypted messages, should not have changed"
- output=$(notmuch search wumpus)
+ output=$(notmuch search wumpus | notmuch_search_sanitize)
  test_expect_equal \
      "$output" \
      "$expected"
@@@ -190,9 -186,9 +188,9 @@@ test_expect_equal 
  
  # ensure that the tags remain even when we are dropping the cleartext.
  test_begin_subtest "verify that tags remain without cleartext"
- output=$(notmuch search tag:blarney)
- expected='thread:0000000000000001   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox)
- thread:0000000000000005   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)'
+ output=$(notmuch search tag:blarney | notmuch_search_sanitize)
+ expected='thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox)
+ thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)'
  test_expect_equal \
      "$output" \
      "$expected"
@@@ -201,7 -197,7 +199,7 @@@ test_begin_subtest "index cleartext wit
  test_expect_success "notmuch reindex --decrypt=nostash tag:blarney"
  
  test_begin_subtest "Ensure that the indexed terms are present"
- output=$(notmuch search wumpus)
+ output=$(notmuch search wumpus | notmuch_search_sanitize)
  test_expect_equal \
      "$output" \
      "$expected"