diff --git a/messagecomposer/src/settings/messagecomposersettings.cpp b/messagecomposer/src/settings/messagecomposersettings.cpp
index 8a417a0f..3983c100 100644
--- a/messagecomposer/src/settings/messagecomposersettings.cpp
+++ b/messagecomposer/src/settings/messagecomposersettings.cpp
@@ -1,62 +1,63 @@
 /*
     This file is part of KMail.
 
     Copyright (c) 2005 David Faure <faure@kde.org>
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2,
-    as published by the Free Software Foundation.
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include "messagecomposersettings.h"
 #include <QTimer>
 
 using namespace MessageComposer;
 
 MessageComposerSettings *MessageComposerSettings::mSelf = nullptr;
 
 MessageComposerSettings *MessageComposerSettings::self()
 {
     if (!mSelf) {
         mSelf = new MessageComposerSettings();
         mSelf->load();
     }
 
     return mSelf;
 }
 
 MessageComposerSettings::MessageComposerSettings()
 {
     mConfigSyncTimer = new QTimer(this);
     mConfigSyncTimer->setSingleShot(true);
     connect(mConfigSyncTimer, &QTimer::timeout, this, &MessageComposerSettings::slotSyncNow);
 }
 
 void MessageComposerSettings::requestSync()
 {
     if (!mConfigSyncTimer->isActive()) {
         mConfigSyncTimer->start(0);
     }
 }
 
 void MessageComposerSettings::slotSyncNow()
 {
     config()->sync();
 }
 
 MessageComposerSettings::~MessageComposerSettings()
 {
 }
diff --git a/messagecomposer/src/settings/messagecomposersettings.h b/messagecomposer/src/settings/messagecomposersettings.h
index 9a7e807d..e4b2324f 100644
--- a/messagecomposer/src/settings/messagecomposersettings.h
+++ b/messagecomposer/src/settings/messagecomposersettings.h
@@ -1,58 +1,59 @@
 /*
     This file is part of KMail.
 
     Copyright (c) 2005 David Faure <faure@kde.org>
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2,
-    as published by the Free Software Foundation.
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef MESSAGECOMPOSERSETTINGS_H
 #define MESSAGECOMPOSERSETTINGS_H
 
 #include "messagecomposer_export.h"
 #include "messagecomposersettings_base.h"
 
 class QTimer;
 
 namespace MessageComposer {
 class MESSAGECOMPOSER_EXPORT MessageComposerSettings : public MessageComposer::MessageComposerSettingsBase
 {
     Q_OBJECT
 public:
     static MessageComposerSettings *self();
 
     /** Call this slot instead of directly @ref KConfig::sync() to
       minimize the overall config writes. Calling this slot will
       schedule a sync of the application config file using a timer, so
       that many consecutive calls can be condensed into a single
       sync, which is more efficient. */
     void requestSync();
 
 private Q_SLOTS:
     void slotSyncNow();
 
 private:
     MessageComposerSettings();
     ~MessageComposerSettings() override;
     static MessageComposerSettings *mSelf;
 
     QTimer *mConfigSyncTimer = nullptr;
 };
 }
 
 #endif /* MESSAGECOMPOSER_GLOBALSETTINGS_H */