diff --git a/src/sieveimapinterface/kmsieveimappasswordprovider.cpp b/src/sieveimapinterface/kmsieveimappasswordprovider.cpp
index 39840eb23..96b75b7fd 100644
--- a/src/sieveimapinterface/kmsieveimappasswordprovider.cpp
+++ b/src/sieveimapinterface/kmsieveimappasswordprovider.cpp
@@ -11,7 +11,7 @@
 #include <memory>
 
 KMSieveImapPasswordProvider::KMSieveImapPasswordProvider(WId wid)
-    : m_wid(wid)
+    : mWid(wid)
 {
 }
 
@@ -27,7 +27,7 @@ QString KMSieveImapPasswordProvider::sieveCustomPassword(const QString &identifi
 
 QString KMSieveImapPasswordProvider::walletPassword(const QString &identifier)
 {
-    std::unique_ptr<KWallet::Wallet> wallet(KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), m_wid));
+    std::unique_ptr<KWallet::Wallet> wallet(KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), mWid));
     if (wallet) {
         if (wallet->hasFolder(QStringLiteral("imap"))) {
             QString pwd;
diff --git a/src/sieveimapinterface/kmsieveimappasswordprovider.h b/src/sieveimapinterface/kmsieveimappasswordprovider.h
index f6393da64..9f1aada27 100644
--- a/src/sieveimapinterface/kmsieveimappasswordprovider.h
+++ b/src/sieveimapinterface/kmsieveimappasswordprovider.h
@@ -22,7 +22,7 @@ public:
 private:
     Q_REQUIRED_RESULT QString walletPassword(const QString &identifier);
 
-    WId m_wid;
+    const WId mWid;
 };
 
 #endif
diff --git a/src/tag/tagselectdialog.h b/src/tag/tagselectdialog.h
index 23fbc5498..ab25c4730 100644
--- a/src/tag/tagselectdialog.h
+++ b/src/tag/tagselectdialog.h
@@ -35,8 +35,8 @@ private:
     enum ItemType {
         UrlTag = Qt::UserRole + 1
     };
-    int mNumberOfSelectedMessages = -1;
-    Akonadi::Item mSelectedItem;
+    const int mNumberOfSelectedMessages = -1;
+    const Akonadi::Item mSelectedItem;
 
     Akonadi::Tag::List mCurrentSelectedTags;
     QVector<MailCommon::Tag::Ptr> mTagList;