diff --git a/kmail/editorsendcheckplugins/CMakeLists.txt b/kmail/editorsendcheckplugins/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8cb61529b00c8809afdab878b70bf6dd2278638d 100644
--- a/kmail/editorsendcheckplugins/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(confirm-address)
diff --git a/kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt b/kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..937866bad1279d46bfd6cb7459169818bc4b00c1
--- /dev/null
+++ b/kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(kmail_confirmaddresseditorplugin_SRCS
+    confirmaddressinterface.cpp
+    confirmaddressplugin.cpp
+    )
+
+ecm_qt_declare_logging_category(kmail_confirmaddresseditorplugin_SRCS HEADER confirmaddressplugin_debug.h IDENTIFIER KMAIL_EDITOR_CONFIRMADDRESS_PLUGIN_LOG CATEGORY_NAME log_kmail_confirmaddressplugin)
+
+add_library(kmail_confirmaddresseditorplugin MODULE ${kmail_confirmaddresseditorplugin_SRCS})
+
+target_link_libraries(kmail_confirmaddresseditorplugin
+    KF5::IconThemes KF5::MessageComposer KF5::I18n
+    )
+
+install(TARGETS kmail_confirmaddresseditorplugin DESTINATION ${PLUGIN_INSTALL_DIR}/kmail)
+
+if(BUILD_TESTING)
+    add_subdirectory(autotests)
+endif()
+
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp b/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2662ebfe51b69408fb7b6317f74820331786c7ad
--- /dev/null
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp
@@ -0,0 +1,37 @@
+/*
+   Copyright (C) 2016 Montel Laurent <montel@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+
+#include "confirmaddressinterface.h"
+
+ConfirmAddressInterface::ConfirmAddressInterface(QObject *parent)
+    : MessageComposer::PluginEditorCheckBeforeSendInterface(parent)
+{
+
+}
+
+ConfirmAddressInterface::~ConfirmAddressInterface()
+{
+
+}
+
+void ConfirmAddressInterface::exec()
+{
+
+}
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.h b/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.h
new file mode 100644
index 0000000000000000000000000000000000000000..c0977b142145292eed52a1e1aec272a9aae52f20
--- /dev/null
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.h
@@ -0,0 +1,34 @@
+/*
+   Copyright (C) 2016 Montel Laurent <montel@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef CONFIRMADDRESSINTERFACE_H
+#define CONFIRMADDRESSINTERFACE_H
+
+#include <MessageComposer/PluginEditorCheckBeforeSendInterface>
+
+class ConfirmAddressInterface : public MessageComposer::PluginEditorCheckBeforeSendInterface
+{
+    Q_OBJECT
+public:
+    explicit ConfirmAddressInterface(QObject *parent = Q_NULLPTR);
+    ~ConfirmAddressInterface();
+    void exec() Q_DECL_OVERRIDE;
+};
+
+#endif // CONFIRMADDRESSINTERFACE_H
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ad3021b44ffe4fab65e6ddff3bf6ebe6138c440d
--- /dev/null
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
@@ -0,0 +1,36 @@
+/*
+   Copyright (C) 2016 Montel Laurent <montel@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "confirmaddressplugin.h"
+
+ConfirmAddressPlugin::ConfirmAddressPlugin(QObject *parent)
+    : MessageComposer::PluginEditorCheckBeforeSend()
+{
+
+}
+
+ConfirmAddressPlugin::~ConfirmAddressPlugin()
+{
+
+}
+
+MessageComposer::PluginEditorCheckBeforeSendInterface *ConfirmAddressPlugin::createInterface(QWidget *parent)
+{
+    return {};
+}
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h
new file mode 100644
index 0000000000000000000000000000000000000000..3d9079937c700f43dd13c17f499559e6170b1966
--- /dev/null
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.h
@@ -0,0 +1,35 @@
+/*
+   Copyright (C) 2016 Montel Laurent <montel@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef CONFIRMADDRESSPLUGIN_H
+#define CONFIRMADDRESSPLUGIN_H
+
+#include <MessageComposer/PluginEditorCheckBeforeSend>
+
+class ConfirmAddressPlugin : public MessageComposer::PluginEditorCheckBeforeSend
+{
+    Q_OBJECT
+public:
+    explicit ConfirmAddressPlugin(QObject *parent = Q_NULLPTR);
+    ~ConfirmAddressPlugin();
+
+    MessageComposer::PluginEditorCheckBeforeSendInterface *createInterface(QWidget *parent) Q_DECL_OVERRIDE;
+};
+
+#endif // CONFIRMADDRESSPLUGIN_H