diff --git a/kmail/followupreminder/followupremindercreatejob.cpp b/kmail/followupreminder/followupremindercreatejob.cpp
index c6c93f545b6d8d91fff6686493f711eecb86ed6f..a551b7aa283d9137f3866b06bce1ebc9a49e3568 100644
--- a/kmail/followupreminder/followupremindercreatejob.cpp
+++ b/kmail/followupreminder/followupremindercreatejob.cpp
@@ -22,7 +22,7 @@
 #include <akonadi/itemcreatejob.h>
 
 FollowupReminderCreateJob::FollowupReminderCreateJob(QObject *parent)
-    : QObject(parent),
+    : KJob(parent),
       mInfo(new FollowUpReminder::FollowUpReminderInfo)
 {
 
@@ -80,7 +80,7 @@ void FollowupReminderCreateJob::start()
         }
     } else {
         qDebug()<<"FollowupReminderCreateJob info not valid ";
-        deleteLater();
+        Q_EMIT emitResult();
         return;
     }
 }
@@ -99,5 +99,5 @@ void FollowupReminderCreateJob::slotCreateNewTodo(KJob *job)
 void FollowupReminderCreateJob::writeFollowupReminderInfo()
 {
     FollowUpReminder::FollowUpReminderUtil::writeFollowupReminderInfo(FollowUpReminder::FollowUpReminderUtil::defaultConfig(), mInfo, true);
-    deleteLater();
+    Q_EMIT emitResult();
 }
diff --git a/kmail/followupreminder/followupremindercreatejob.h b/kmail/followupreminder/followupremindercreatejob.h
index d1f01a3657c27000bd19d2033586550e403ce4e8..9ffeb2c671fd3debec56222f0b5dc8a9128cbb72 100644
--- a/kmail/followupreminder/followupremindercreatejob.h
+++ b/kmail/followupreminder/followupremindercreatejob.h
@@ -23,8 +23,9 @@
 #include <Akonadi/Item>
 #include <Akonadi/Collection>
 #include "agents/followupreminderagent/followupreminderinfo.h"
+#include <KJob>
 
-class FollowupReminderCreateJob : public QObject
+class FollowupReminderCreateJob : public KJob
 {
     Q_OBJECT
 public: