X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=380bbe3daa66e9a878c084b6f1e7fc2b1ace1470;hp=7a00917ec709ce3f7b30fff2699b993d2860840c;hb=088801a14ab1ccf4c65e5bf7b50b3a1172c477d7;hpb=b65a783195cb459a316370eb7a956b6029102f2e

diff --git a/lib/database.cc b/lib/database.cc
index 7a00917e..380bbe3d 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1642,6 +1642,13 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
 	_notmuch_message_add_filename (message, filename);
 
+	/* This is a new message or it has a new filename and as such,
+	 * its tags in database either do not exists or might be out
+	 * of date. We assign the tags later in notmuch new, but until
+	 * then we should not synchronize the tags back to the maildir
+	 * flags (if notmuch is configured to do so). */
+	notmuch_message_set_flag(message, NOTMUCH_MESSAGE_FLAG_TAGS_INVALID, TRUE);
+
 	/* Is this a newly created message object? */
 	if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {
 	    _notmuch_message_add_term (message, "type", "mail");