diff --git a/agents/followupreminderagent/followupreminderinfodialog.cpp b/agents/followupreminderagent/followupreminderinfodialog.cpp
index ffdb35cea..94eae0ca4 100644
--- a/agents/followupreminderagent/followupreminderinfodialog.cpp
+++ b/agents/followupreminderagent/followupreminderinfodialog.cpp
@@ -58,7 +58,7 @@ FollowUpReminderInfoDialog::FollowUpReminderInfoDialog(QWidget *parent)
         QStringLiteral("followupreminderagent"),
         i18n("Follow Up Reminder Agent"),
         QStringLiteral(KDEPIM_VERSION),
-        i18n("Follow Up Mail."),
+        i18n("Follow Up Reminder"),
         KAboutLicense::GPL_V2,
         i18n("Copyright (C) 2014-2017 Laurent Montel"));
 
diff --git a/agents/followupreminderagent/followupremindernoanswerdialog.cpp b/agents/followupreminderagent/followupremindernoanswerdialog.cpp
index 12124ea9c..053102645 100644
--- a/agents/followupreminderagent/followupremindernoanswerdialog.cpp
+++ b/agents/followupreminderagent/followupremindernoanswerdialog.cpp
@@ -33,7 +33,7 @@
 FollowUpReminderNoAnswerDialog::FollowUpReminderNoAnswerDialog(QWidget *parent)
     : QDialog(parent)
 {
-    setWindowTitle(i18n("Follow Up Mail"));
+    setWindowTitle(i18n("Follow Up Reminder"));
     setWindowIcon(QIcon::fromTheme(QStringLiteral("kmail")));
     setAttribute(Qt::WA_DeleteOnClose);
 
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 2c5613fb5..6b9d4f32f 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -1321,7 +1321,7 @@ void KMComposerWin::setupActions(void)
 
     mComposerBase->editor()->createActions(actionCollection());
 
-    mFollowUpToggleAction = new KToggleAction(i18n("Follow Up Mail..."), this);
+    mFollowUpToggleAction = new KToggleAction(i18n("Create Follow Up Reminder..."), this);
     actionCollection()->addAction(QStringLiteral("follow_up_mail"), mFollowUpToggleAction);
     connect(mFollowUpToggleAction, &KToggleAction::triggered, this, &KMComposerWin::slotFollowUpMail);
     mFollowUpToggleAction->setEnabled(FollowUpReminder::FollowUpReminderUtil::followupReminderAgentEnabled());