diff --git a/src/collectionpage/collectiongeneralwidget.cpp b/src/collectionpage/collectiongeneralwidget.cpp
index 4890c71..7340e7f 100644
--- a/src/collectionpage/collectiongeneralwidget.cpp
+++ b/src/collectionpage/collectiongeneralwidget.cpp
@@ -114,6 +114,9 @@ void CollectionGeneralWidget::slotIdentityCheckboxChanged()
 
 void CollectionGeneralWidget::save(Akonadi::Collection &collection)
 {
+    if (!mFolderCollection) {
+        mFolderCollection = FolderSettings::forCollection(collection);
+    }
     if (!mNotifyOnNewMailCheckBox->isChecked()) {
         Akonadi::NewMailNotifierAttribute *newMailNotifierAttr = collection.attribute<Akonadi::NewMailNotifierAttribute>(Akonadi::Collection::AddIfMissing);
         newMailNotifierAttr->setIgnoreNewMail(true);
diff --git a/src/collectionpage/collectiontemplateswidget.cpp b/src/collectionpage/collectiontemplateswidget.cpp
index daf34e1..42706c0 100644
--- a/src/collectionpage/collectiontemplateswidget.cpp
+++ b/src/collectionpage/collectiontemplateswidget.cpp
@@ -54,8 +54,11 @@ CollectionTemplatesWidget::~CollectionTemplatesWidget()
 {
 }
 
-void CollectionTemplatesWidget::save(Akonadi::Collection &)
+void CollectionTemplatesWidget::save(Akonadi::Collection &col)
 {
+    if (mCollectionId.isEmpty()) {
+        mCollectionId = QString::number(col.id());
+    }
     if (mChanged && !mCollectionId.isEmpty()) {
         TemplateParser::Templates t(mCollectionId);
         //qCDebug(KMAIL_LOG) << "use custom templates for folder" << fid <<":" << mCustom->isChecked();
diff --git a/src/collectionpage/collectionviewwidget.cpp b/src/collectionpage/collectionviewwidget.cpp
index 016d7eb..735512a 100644
--- a/src/collectionpage/collectionviewwidget.cpp
+++ b/src/collectionpage/collectionviewwidget.cpp
@@ -152,6 +152,9 @@ void CollectionViewWidget::load(const Akonadi::Collection &col)
 
 void CollectionViewWidget::save(Akonadi::Collection &col)
 {
+    if (!mFolderCollection) {
+        mFolderCollection = MailCommon::FolderSettings::forCollection(col);
+    }
     const int currentIndex = mShowSenderReceiverComboBox->currentIndex();
     if (mShowSenderReceiverValue != currentIndex) {
         if (currentIndex == 1) {