X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lib%2Fadd-message.cc;fp=lib%2Fadd-message.cc;h=d6e5e73d35f4b4c3183df5642ac251c95ad48641;hb=3f4de98e7c8c70f9a86a4f899147126f79907bd9;hp=0c34d31822bb48a654631d3d41015c905e1fe07a;hpb=349fc2980346db2dba619cda5d9cdf0d943d3053;p=notmuch

diff --git a/lib/add-message.cc b/lib/add-message.cc
index 0c34d318..d6e5e73d 100644
--- a/lib/add-message.cc
+++ b/lib/add-message.cc
@@ -407,14 +407,17 @@ static notmuch_status_t
 _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 {
@@ -541,7 +544,7 @@ notmuch_database_index_file (notmuch_database_t *notmuch,
 	}
 
 	ret = _notmuch_database_link_message (notmuch, message,
-					      message_file, is_ghost);
+					      message_file, is_ghost, is_new);
 	if (ret)
 	    goto DONE;