diff --git a/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt b/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt
index 52c36f53bde30197a621ecec4a822dcef201ef07..aae6b7d131e775c053705755bcea15c4e37e630b 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(kmail_checkbeforesendeditorplugin_SRCS
     checkbeforesendplugin.cpp
     checkbeforesendinterface.cpp
-    checkbeforesendconfigurewidget.cpp
+    configurewidget/checkbeforesendconfigurewidget.cpp
     duplicateemails/checkduplicateemailsdialog.cpp
     duplicateemails/checkduplicateemailsjob.cpp
     sendattachments/checkattachmentdialog.cpp
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt b/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt
index c62d69c2f6573913eb8ae5873f144ea2d416bd14..bc9cb5e900fa6e9e284a0739bb7a4791f77b29f7 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt
@@ -12,8 +12,8 @@ macro(add_kmail_checkbeforesend_unittest _source _additional)
 endmacro ()
 
 
-add_kmail_checkbeforesend_unittest(checkbeforesendplugintest.cpp "../sendattachments/checkattachmentjob.cpp;../sendattachments/checkattachmentdialog.cpp;../duplicateemails/checkduplicateemailsjob.cpp;../duplicateemails/checkduplicateemailsdialog.cpp;../checkbeforesendplugin.cpp;../checkbeforesendinterface.cpp;../checkbeforesendconfigurewidget.cpp")
-add_kmail_checkbeforesend_unittest(checkbeforesendconfigurewidgettest.cpp "../checkbeforesendconfigurewidget.cpp")
+add_kmail_checkbeforesend_unittest(checkbeforesendplugintest.cpp "../sendattachments/checkattachmentjob.cpp;../sendattachments/checkattachmentdialog.cpp;../duplicateemails/checkduplicateemailsjob.cpp;../duplicateemails/checkduplicateemailsdialog.cpp;../checkbeforesendplugin.cpp;../checkbeforesendinterface.cpp;../configurewidget/checkbeforesendconfigurewidget.cpp")
+add_kmail_checkbeforesend_unittest(checkbeforesendconfigurewidgettest.cpp "../configurewidget/checkbeforesendconfigurewidget.cpp")
 add_kmail_checkbeforesend_unittest(checkduplicateemailsdialogtest.cpp "../duplicateemails/checkduplicateemailsdialog.cpp")
 add_kmail_checkbeforesend_unittest(checkduplicateemailsjobtest.cpp "../duplicateemails/checkduplicateemailsjob.cpp")
 
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp b/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp
index b41c15a4985e5f7162c625089324fa4ca7feaca3..5db84ce34751eb6371730e5209e664ebfe0a6578 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/autotests/checkbeforesendconfigurewidgettest.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "checkbeforesendconfigurewidgettest.h"
-#include "../checkbeforesendconfigurewidget.h"
+#include "../configurewidget/checkbeforesendconfigurewidget.h"
 #include <QTest>
 #include <QVBoxLayout>
 #include <QCheckBox>
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
index 60bdd5c073947652cf6c73fb7c185a8fb87b68cc..4d9d46264116ff121a67e0fa551d3a7809634b2a 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
@@ -19,7 +19,7 @@
 
 #include "checkbeforesendplugin.h"
 #include "checkbeforesendinterface.h"
-#include "checkbeforesendconfigurewidget.h"
+#include "configurewidget/checkbeforesendconfigurewidget.h"
 
 #include <KLocalizedString>
 #include <kpluginfactory.h>
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendconfigurewidget.cpp b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
similarity index 100%
rename from kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendconfigurewidget.cpp
rename to kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendconfigurewidget.h b/kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.h
similarity index 100%
rename from kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendconfigurewidget.h
rename to kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.h