diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -347,7 +347,6 @@
     KF5::Contacts
     KF5::PimTextEdit
     KF5::MessageViewer
-    KF5::SendLater
     KF5::FollowupReminder
     KF5::IconThemes
     KF5::XmlGui
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -147,9 +147,9 @@
 #include <PimCommon/LineEditWithAutoCorrection>
 #include <PimCommon/CustomToolsPluginManager>
 
-#include <SendLater/SendLaterDialog>
-#include <SendLater/SendLaterInfo>
-#include <SendLater/SendLaterUtil>
+#include <MessageComposer/SendLaterDialog>
+#include <MessageComposer/SendLaterInfo>
+#include <MessageComposer/SendLaterUtil>
 
 #include <TemplateParser/TemplateParserJob>
 #include <TemplateParser/TemplatesConfiguration>
@@ -2643,7 +2643,7 @@
             mComposerBase->setSendLaterInfo(nullptr);
             const bool wasRegistered = sendLaterRegistered();
             if (wasRegistered) {
-                SendLater::SendLaterInfo *info = new SendLater::SendLaterInfo;
+                auto info = new MessageComposer::SendLaterInfo;
                 info->setRecurrence(false);
                 info->setSubject(subject());
                 info->setDateTime(QDateTime::currentDateTime().addSecs(KMailSettings::self()->undoSendDelay()));
@@ -2823,7 +2823,8 @@
 
 bool KMComposerWin::sendLaterRegistered() const
 {
-    return SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled();
+    return MessageComposer::SendLaterUtil::sentLaterAgentWasRegistered()
+            && MessageComposer::SendLaterUtil::sentLaterAgentEnabled();
 }
 
 void KMComposerWin::slotSendLater()
@@ -2838,23 +2839,23 @@
     if (mComposerBase->editor()->checkExternalEditorFinished()) {
         const bool wasRegistered = sendLaterRegistered();
         if (wasRegistered) {
-            SendLater::SendLaterInfo *info = nullptr;
-            QPointer<SendLater::SendLaterDialog> dlg = new SendLater::SendLaterDialog(info, this);
+            MessageComposer::SendLaterInfo *info = nullptr;
+            QPointer<MessageComposer::SendLaterDialog> dlg = new MessageComposer::SendLaterDialog(info, this);
             if (dlg->exec()) {
                 info = dlg->info();
-                const SendLater::SendLaterDialog::SendLaterAction action = dlg->action();
+                const MessageComposer::SendLaterDialog::SendLaterAction action = dlg->action();
                 delete dlg;
                 switch (action) {
-                case SendLater::SendLaterDialog::Unknown:
+                case MessageComposer::SendLaterDialog::Unknown:
                     qCDebug(KMAIL_LOG) << "Sendlater action \"Unknown\": Need to fix it.";
                     break;
-                case SendLater::SendLaterDialog::Canceled:
+                case MessageComposer::SendLaterDialog::Canceled:
                     return;
                     break;
-                case SendLater::SendLaterDialog::PutInOutbox:
+                case MessageComposer::SendLaterDialog::PutInOutbox:
                     doSend(MessageComposer::MessageSender::SendLater);
                     break;
-                case SendLater::SendLaterDialog::SendDeliveryAtTime:
+                case MessageComposer::SendLaterDialog::SendDeliveryAtTime:
                     mComposerBase->setSendLaterInfo(info);
                     if (info->isRecurrence()) {
                         doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates, true);
diff --git a/src/undosend/undosendcreatejob.cpp b/src/undosend/undosendcreatejob.cpp
--- a/src/undosend/undosendcreatejob.cpp
+++ b/src/undosend/undosendcreatejob.cpp
@@ -19,7 +19,9 @@
 
 #include "undosendcreatejob.h"
 #include "kmail_debug.h"
-#include <SendLater/SendLaterUtil>
+
+#include <MessageComposer/SendLaterRemoveJob>
+
 #include <KNotification>
 #include <KLocalizedString>
 #include <QTimer>
@@ -90,7 +92,8 @@
 void UndoSendCreateJob::undoSendEmail()
 {
     mTimer->stop();
-    SendLater::SendLaterUtil::removeItem(mAkonadiIndex);
+    auto job = new MessageComposer::SendLaterRemoveJob(mAkonadiIndex, this);
+    job->start();
 }
 
 QString UndoSendCreateJob::subject() const