Don't modify expiry collection when we are not allowed

CMakeLists.txt

@@ -63,7 +63,7 @@ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
-set(MAILCOMMON_LIB_VERSION "5.15.47")
+set(MAILCOMMON_LIB_VERSION "5.15.48")
 set(GRAVATAR_LIB_VERSION "5.15.40")
 set(PIMCOMMON_LIB_VERSION "5.15.40")
 set(GRANTLEETHEME_LIB_VERSION "5.15.40")

plugins/messageviewerconfigureplugins/foldersettings/folderconfiguresettingsexperywidget.cpp

@@ -24,8 +24,10 @@ FolderConfigureSettingsExperyWidget::~FolderConfigureSettingsExperyWidget()
 
 void FolderConfigureSettingsExperyWidget::save(Akonadi::Collection &col)
 {
-    const MailCommon::CollectionExpirySettings settings = mCollectionExpiryWidget->settings();
-    if (wasModified()) {
-        mCollectionExpiryWidget->save(settings, col, true, false);
+    if (MailCommon::CollectionExpiryWidget::canHandle(col)) {
+        const MailCommon::CollectionExpirySettings settings = mCollectionExpiryWidget->settings();
+        if (wasModified()) {
+            mCollectionExpiryWidget->save(settings, col, true, false);
+        }
     }
 }