From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 12 May 2023 15:48:58 +0000 (+0300)
Subject: lib-storage: Fix mail_attachment_detection_options=no-flags-on-fetch
X-Git-Tag: 2.4.2~374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c903991dd5f49e937727a66168b4943b2bcf5090;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fix mail_attachment_detection_options=no-flags-on-fetch

The attachment flag was still added if message body was parsed.
---

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index a8a2faebe8..2f5f8a30eb 100644
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1239,9 +1239,14 @@ index_mail_parse_body_finish(struct index_mail *mail,
 	index_mail_body_parsed_cache_bodystructure(mail, field);
 	index_mail_cache_sizes(mail);
 	index_mail_cache_dates(mail);
-	if (mail_set->parsed_mail_attachment_detection_add_flags &&
-	    !mail_has_attachment_keywords(&mail->mail.mail))
-		index_mail_try_set_attachment_keywords(mail);
+	if (mail->mail.mail.saving) {
+		if (mail_set->parsed_mail_attachment_detection_add_flags &&
+		    !mail_has_attachment_keywords(&mail->mail.mail))
+			index_mail_try_set_attachment_keywords(mail);
+	} else {
+		if (index_mail_want_attachment_keywords_on_fetch(mail))
+			index_mail_try_set_attachment_keywords(mail);
+	}
 	return 0;
 }