diff --git a/src/identity/identitypage.cpp b/src/identity/identitypage.cpp
index b365c60f7..554410584 100644
--- a/src/identity/identitypage.cpp
+++ b/src/identity/identitypage.cpp
@@ -1,352 +1,352 @@
 /*
  *   kmail: KDE mail client
  *   Copyright (C) 2000 Espen Sand, espen@kde.org
  *   Copyright (C) 2001-2003 Marc Mutz, mutz@kde.org
  *   Contains code segments and ideas from earlier kmail dialog code.
  *   Copyright (C) 2010 Volker Krause <vkrause@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; if not, write to the Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
 #include "identitypage.h"
 
 #include "identitydialog.h"
 #include "newidentitydialog.h"
 #ifndef KCM_KPIMIDENTITIES_STANDALONE
 #include "kmkernel.h"
 #include "settings/kmailsettings.h"
 #endif
 
 #include <MailCommon/MailKernel>
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KIdentityManagement/kidentitymanagement/identitymanager.h>
 
 #include <KMessageBox>
 #include <QMenu>
 #include <KLocalizedString>
 #include "kmail_debug.h"
 
 #include <QTreeWidgetItem>
 
 using namespace KMail;
 
 QString IdentityPage::helpAnchor() const
 {
     return QStringLiteral("configure-identity");
 }
 
 IdentityPage::IdentityPage(QWidget *parent)
     : ConfigModuleTab(parent)
 {
     if (!MailCommon::Kernel::self()->kernelIsRegistered()) {
         return;
     }
     mIdentityManager = KernelIf->identityManager();
     connect(mIdentityManager, &KIdentityManagement::IdentityManager::needToReloadIdentitySettings, this, &IdentityPage::load);
 
     mIPage.setupUi(this);
     mIPage.mIdentityList->setIdentityManager(mIdentityManager);
 
     connect(mIPage.mIdentityList, &QTreeWidget::itemSelectionChanged, this, &IdentityPage::slotIdentitySelectionChanged);
     connect(this, qOverload<bool>(&IdentityPage::changed), this, &IdentityPage::slotIdentitySelectionChanged);
     connect(mIPage.mIdentityList, qOverload<KMail::IdentityListViewItem *, const QString &>(&IdentityListView::rename),
             this, &IdentityPage::slotRenameIdentityFromItem);
     connect(mIPage.mIdentityList, &QTreeWidget::itemDoubleClicked, this, &IdentityPage::slotModifyIdentity);
     connect(mIPage.mIdentityList, &IdentityListView::contextMenu, this, &IdentityPage::slotContextMenu);
     // ### connect dragged(...), ...
 
     connect(mIPage.mButtonAdd, &QPushButton::clicked, this, &IdentityPage::slotNewIdentity);
     connect(mIPage.mModifyButton, &QPushButton::clicked, this, &IdentityPage::slotModifyIdentity);
     connect(mIPage.mRenameButton, &QPushButton::clicked,
             this, &IdentityPage::slotRenameIdentity);
     connect(mIPage.mRemoveButton, &QPushButton::clicked, this, &IdentityPage::slotRemoveIdentity);
     connect(mIPage.mSetAsDefaultButton, &QPushButton::clicked, this, &IdentityPage::slotSetAsDefault);
     load();
 }
 
 IdentityPage::~IdentityPage()
 {
 }
 
 void IdentityPage::load()
 {
     if (!MailCommon::Kernel::self()->kernelIsRegistered()) {
         return;
     }
     mOldNumberOfIdentities = mIdentityManager->shadowIdentities().count();
     // Fill the list:
     mIPage.mIdentityList->clear();
     QTreeWidgetItem *item = nullptr;
     KIdentityManagement::IdentityManager::Iterator end(mIdentityManager->modifyEnd());
 
     for (KIdentityManagement::IdentityManager::Iterator it = mIdentityManager->modifyBegin(); it != end; ++it) {
         item = new IdentityListViewItem(mIPage.mIdentityList, item, *it);
     }
     if (mIPage.mIdentityList->currentItem()) {
         mIPage.mIdentityList->currentItem()->setSelected(true);
     }
 }
 
 void IdentityPage::save()
 {
     if (!MailCommon::Kernel::self()->kernelIsRegistered()) {
         return;
     }
     mIdentityManager->sort();
     mIdentityManager->commit();
 
 #ifndef KCM_KPIMIDENTITIES_STANDALONE
     if (mOldNumberOfIdentities < 2 && mIPage.mIdentityList->topLevelItemCount() > 1) {
         // have more than one identity, so better show the combo in the
         // composer now:
         int showHeaders = KMailSettings::self()->headers();
         showHeaders |= KMail::Composer::HDR_IDENTITY;
         KMailSettings::self()->setHeaders(showHeaders);
     }
     // and now the reverse
     if (mOldNumberOfIdentities > 1 && mIPage.mIdentityList->topLevelItemCount() < 2) {
         // have only one identity, so remove the combo in the composer:
         int showHeaders = KMailSettings::self()->headers();
         showHeaders &= ~KMail::Composer::HDR_IDENTITY;
         KMailSettings::self()->setHeaders(showHeaders);
     }
 #endif
 }
 
 void IdentityPage::slotNewIdentity()
 {
     Q_ASSERT(!mIdentityDialog);
 
     QScopedPointer<NewIdentityDialog> dialog(new NewIdentityDialog(
                                                  mIdentityManager, this));
     dialog->setObjectName(QStringLiteral("new"));
 
     if (dialog->exec() == QDialog::Accepted && dialog) {
         QString identityName = dialog->identityName().trimmed();
         Q_ASSERT(!identityName.isEmpty());
 
         //
         // Construct a new Identity:
         //
         switch (dialog->duplicateMode()) {
         case NewIdentityDialog::ExistingEntry:
         {
             KIdentityManagement::Identity &dupThis = mIdentityManager->modifyIdentityForName(dialog->duplicateIdentity());
             mIdentityManager->newFromExisting(dupThis, identityName);
             break;
         }
         case NewIdentityDialog::ControlCenter:
             mIdentityManager->newFromControlCenter(identityName);
             break;
         case NewIdentityDialog::Empty:
             mIdentityManager->newFromScratch(identityName);
         default:
             ;
         }
 
         //
         // Insert into listview:
         //
         KIdentityManagement::Identity &newIdent = mIdentityManager->modifyIdentityForName(identityName);
         QTreeWidgetItem *item = nullptr;
         if (!mIPage.mIdentityList->selectedItems().isEmpty()) {
             item = mIPage.mIdentityList->selectedItems().at(0);
         }
 
         QTreeWidgetItem *newItem = nullptr;
         if (item) {
             newItem = new IdentityListViewItem(mIPage.mIdentityList, mIPage.mIdentityList->itemAbove(item), newIdent);
         } else {
             newItem = new IdentityListViewItem(mIPage.mIdentityList, newIdent);
         }
 
         mIPage.mIdentityList->selectionModel()->clearSelection();
         if (newItem) {
             newItem->setSelected(true);
         }
 
         slotModifyIdentity();
         updateButtons();
     }
 }
 
 void IdentityPage::slotModifyIdentity()
 {
     Q_ASSERT(!mIdentityDialog);
 
     IdentityListViewItem *item = nullptr;
     if (!mIPage.mIdentityList->selectedItems().isEmpty()) {
         item = dynamic_cast<IdentityListViewItem *>(mIPage.mIdentityList->selectedItems().first());
     }
     if (!item) {
         return;
     }
 
     mIdentityDialog = new IdentityDialog(this);
     mIdentityDialog->setIdentity(item->identity());
 
     // Hmm, an unmodal dialog would be nicer, but a modal one is easier ;-)
     if (mIdentityDialog->exec() == QDialog::Accepted) {
         mIdentityDialog->updateIdentity(item->identity());
         item->redisplay();
         save();
     }
 
     delete mIdentityDialog;
     mIdentityDialog = nullptr;
 }
 
 void IdentityPage::slotRemoveIdentity()
 {
     Q_ASSERT(!mIdentityDialog);
 
     if (mIdentityManager->shadowIdentities().count() < 2) {
         qCritical() << "Attempted to remove the last identity!";
     }
 
     const int numberOfIdentity = mIPage.mIdentityList->selectedItems().count();
     QString identityName;
     IdentityListViewItem *item = nullptr;
     const QList<QTreeWidgetItem *> selectedItems = mIPage.mIdentityList->selectedItems();
     if (numberOfIdentity == 1) {
         if (!mIPage.mIdentityList->selectedItems().isEmpty()) {
             item = dynamic_cast<IdentityListViewItem *>(mIPage.mIdentityList->selectedItems().at(0));
         }
         if (!item) {
             return;
         }
         identityName = item->identity().identityName();
     }
-    const QString msg = i18np("<qt>Do you really want to remove the identity named "
-                              "<b>%2</b>?</qt>", "Do you really want to remove theses %2 identities?", numberOfIdentity, identityName);
+    const QString msg = numberOfIdentity == 1 ? i18n("<qt>Do you really want to remove the identity named "
+                              "<b>%1</b>?</qt>", identityName) : i18np("Do you really want to remove this %1 identity?", "Do you really want to remove these %1 identities?", numberOfIdentity);
     if (KMessageBox::warningContinueCancel(this, msg, i18np("Remove Identity", "Remove Identities", numberOfIdentity),
                                            KGuiItem(i18n("&Remove"),
                                                     QStringLiteral("edit-delete")))
         == KMessageBox::Continue) {
         for (QTreeWidgetItem *item : selectedItems) {
             IdentityListViewItem *identityItem = dynamic_cast<IdentityListViewItem *>(item);
             identityName = identityItem->identity().identityName();
             if (mIdentityManager->removeIdentity(identityName)) {
                 delete item;
             }
             if (mIPage.mIdentityList->currentItem()) {
                 mIPage.mIdentityList->currentItem()->setSelected(true);
             }
             refreshList();
             updateButtons();
         }
 
     }
 }
 
 void IdentityPage::slotRenameIdentity()
 {
     Q_ASSERT(!mIdentityDialog);
 
     QTreeWidgetItem *item = nullptr;
 
     if (!mIPage.mIdentityList->selectedItems().isEmpty()) {
         item = mIPage.mIdentityList->selectedItems().first();
     }
     if (!item) {
         return;
     }
 
     mIPage.mIdentityList->editItem(item);
 }
 
 void IdentityPage::slotRenameIdentityFromItem(KMail::IdentityListViewItem *item, const QString &text)
 {
     if (!item) {
         return;
     }
 
     const QString newName = text.trimmed();
     if (!newName.isEmpty()
         && !mIdentityManager->shadowIdentities().contains(newName)) {
         KIdentityManagement::Identity &ident = item->identity();
         ident.setIdentityName(newName);
         save();
     }
     item->redisplay();
 }
 
 void IdentityPage::slotContextMenu(IdentityListViewItem *item, const QPoint &pos)
 {
     QMenu menu(this);
     menu.addAction(QIcon::fromTheme(QStringLiteral("list-add")), i18n("Add..."), this, &IdentityPage::slotNewIdentity);
     if (item) {
         menu.addAction(QIcon::fromTheme(QStringLiteral("document-edit")), i18n("Modify..."), this, &IdentityPage::slotModifyIdentity);
         menu.addAction(QIcon::fromTheme(QStringLiteral("edit-rename")), i18n("Rename"), this, &IdentityPage::slotRenameIdentity);
         if (mIPage.mIdentityList->topLevelItemCount() > 1) {
             menu.addAction(QIcon::fromTheme(QStringLiteral("list-remove")), i18n("Remove"), this, &IdentityPage::slotRemoveIdentity);
         }
         if (!item->identity().isDefault()) {
             menu.addSeparator();
             menu.addAction(i18n("Set as Default"), this, &IdentityPage::slotSetAsDefault);
         }
     }
     menu.exec(pos);
 }
 
 void IdentityPage::slotSetAsDefault()
 {
     Q_ASSERT(!mIdentityDialog);
 
     IdentityListViewItem *item = nullptr;
     if (!mIPage.mIdentityList->selectedItems().isEmpty()) {
         item = dynamic_cast<IdentityListViewItem *>(mIPage.mIdentityList->selectedItems().first());
     }
     if (!item) {
         return;
     }
 
     mIdentityManager->setAsDefault(item->identity().uoid());
     refreshList();
     mIPage.mSetAsDefaultButton->setEnabled(false);
 }
 
 void IdentityPage::refreshList()
 {
     const int numberOfTopLevel(mIPage.mIdentityList->topLevelItemCount());
     for (int i = 0; i < numberOfTopLevel; ++i) {
         IdentityListViewItem *item = dynamic_cast<IdentityListViewItem *>(mIPage.mIdentityList->topLevelItem(i));
         if (item) {
             item->redisplay();
         }
     }
     save();
 }
 
 void IdentityPage::slotIdentitySelectionChanged()
 {
     updateButtons();
 }
 
 void IdentityPage::updateButtons()
 {
     const int numSelectedItems = mIPage.mIdentityList->selectedItems().count();
     mIPage.mRemoveButton->setEnabled(numSelectedItems >= 1);
     mIPage.mModifyButton->setEnabled(numSelectedItems == 1);
     mIPage.mRenameButton->setEnabled(numSelectedItems == 1);
     IdentityListViewItem *item = nullptr;
     if (numSelectedItems > 0) {
         item = dynamic_cast<IdentityListViewItem *>(mIPage.mIdentityList->selectedItems().first());
     }
     const bool enableDefaultButton = (numSelectedItems == 1) && item && !item->identity().isDefault();
     mIPage.mSetAsDefaultButton->setEnabled(enableDefaultButton);
 }