lazy-expunge: Change lazy_expunge_only_last_instance default to yes

diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt
index b5113742e97bbc5a41ed9141eb1f3e5c63d3cb26..58bb8c586581c7589600976def21e7b37465b63d 100644 (file)
--- a/src/lib-settings/settings-history-core.txt
+++ b/src/lib-settings/settings-history-core.txt
@@ -6,6 +6,7 @@ default service/lmtp/service_extra_groups       $SET:default_internal_group     2.4.3   3.2.
 default        service/pop3/service_extra_groups       $SET:default_internal_group     2.4.3   3.2.0
 default        service/submission/service_extra_groups $SET:default_internal_group     2.4.3   3.2.0
 default        mail_access_groups              2.4.3   3.2.0
+default        lazy_expunge_only_last_instance no      2.4.3   3.2.0
 default        mail_attachment_detection_options               2.4.2   3.2.0
 default        @metric_defaults/proxy/metric   auth_successes,auth_failures,login_aborted      2.4.2   3.2.0
 default        fts_search_read_fallback        yes     -       3.2.0

diff --git a/src/plugins/lazy-expunge/lazy-expunge-settings.c b/src/plugins/lazy-expunge/lazy-expunge-settings.c
index 7265ce2afbd3e629323435b0c1b13f5a4390e231..dd5d3501f90565cf8bd1df037e02b5d879add1c8 100644 (file)
--- a/src/plugins/lazy-expunge/lazy-expunge-settings.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-settings.c
@@ -16,7 +16,7 @@ static struct setting_define lazy_expunge_setting_defines[] = {
 };
 
 static struct lazy_expunge_settings lazy_expunge_default_settings = {
-       .lazy_expunge_only_last_instance = FALSE,
+       .lazy_expunge_only_last_instance = TRUE,
        .lazy_expunge_mailbox = "",
 };